summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/date/lib/date.rb1
-rw-r--r--ext/date/lib/date/format.rb1
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b7dfe00e91..8d9b426318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 1 11:13:43 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * ext/date/lib/date/format.rb: removed empty file by @vipulnsward.
+ * ext/date/lib/date.rb: removed needless require.
+ [fix GH-647]
+
Mon Jun 30 16:42:52 2014 Koichi Sasada <ko1@atdot.net>
* gc.c (gc_stat_internal): return size_t value instead of VALUE
diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb
index d235d76e6f..83234f458b 100644
--- a/ext/date/lib/date.rb
+++ b/ext/date/lib/date.rb
@@ -1,7 +1,6 @@
# date.rb: Written by Tadayoshi Funaba 1998-2011
require 'date_core'
-require 'date/format'
class Date
diff --git a/ext/date/lib/date/format.rb b/ext/date/lib/date/format.rb
deleted file mode 100644
index 892e7aacaa..0000000000
--- a/ext/date/lib/date/format.rb
+++ /dev/null
@@ -1 +0,0 @@
-# format.rb: Written by Tadayoshi Funaba 1999-2011