summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--lib/rss/rss.rb2
-rw-r--r--test/rss/test_version.rb2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e408104..148a399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jun 17 09:03:47 2006 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss, test/rss: backported from trunk. (2005-11-16 - now)
+
+ * lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
+ * test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
+
Sat Jun 17 02:01:00 2006 Tanaka Akira <akr@m17n.org>
* lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
@@ -107,7 +114,6 @@ Wed Jun 7 10:45:10 2006 NAKAMURA Usaku <usa@ruby-lang.org>
instead of socket().
ifs socket support is backported from trunk.
->>>>>>> 1.2673.2.1622
Wed Jun 7 09:14:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): binding for the return event hook should have
diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb
index 0d3da8b..fc0cd7b 100644
--- a/lib/rss/rss.rb
+++ b/lib/rss/rss.rb
@@ -59,7 +59,7 @@ require "rss/xml-stylesheet"
module RSS
- VERSION = "0.1.5"
+ VERSION = "0.1.6"
URI = "http://purl.org/rss/1.0/"
diff --git a/test/rss/test_version.rb b/test/rss/test_version.rb
index dbed60b..237f364 100644
--- a/test/rss/test_version.rb
+++ b/test/rss/test_version.rb
@@ -3,7 +3,7 @@ require "rss-testcase"
module RSS
class TestVersion < TestCase
def test_version
- assert_equal("0.1.5", ::RSS::VERSION)
+ assert_equal("0.1.6", ::RSS::VERSION)
end
end
end