[merb-core] Bumped version to 1.0.15 and updated CHANGELOG

merb · Nov 4, 2009 · 199ac42 · 199ac42
1 parent 7fc90aa
commit 199ac42
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+== 1.0.15 "Reality is for those who lack imagination" 2009-11-04
+
+* Added missing merb-cache dependency
+
 == 1.0.14 "This time for real" 2009-11-03
 
 * Fixed merb metapackage dependencies

diff --git a/merb-core/lib/merb-core/version.rb b/merb-core/lib/merb-core/version.rb
@@ -1,5 +1,5 @@
 module Merb
-  VERSION    = '1.0.14' unless defined?(Merb::VERSION)
-  DM_VERSION = '0.10' unless defined?(Merb::DM_VERSION)
-  DO_VERSION = '0.10' unless defined?(Merb::DO_VERSION)
+  VERSION    = '1.0.15' unless defined?(Merb::VERSION)
+  DM_VERSION = '0.10'   unless defined?(Merb::DM_VERSION)
+  DO_VERSION = '0.10'   unless defined?(Merb::DO_VERSION)
 end