aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-10-19 06:24:12 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-10-19 06:24:12 +0000
commit83dc37b91057cc96f35c0b55b6e79a76072b2ab5 (patch)
tree96fccd484e403890e0dcb5e35688210e4723d933 /actionpack
parent328ef3feaad4c110a7277e3432e9203c7fbbb9e2 (diff)
downloadrails-83dc37b91057cc96f35c0b55b6e79a76072b2ab5.tar.gz
rails-83dc37b91057cc96f35c0b55b6e79a76072b2ab5.tar.bz2
rails-83dc37b91057cc96f35c0b55b6e79a76072b2ab5.zip
Made ready to push RC2
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2684 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG3
-rw-r--r--actionpack/lib/action_pack/version.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 993ccbd122..83a7187e40 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,7 +1,10 @@
+*1.10.1* (October 19th, 2005)
+
* Update error trace templates [Nicholas Seckar]
* Stop showing generated routing code in application traces [Nicholas Seckar]
+
*1.10.0* (October 16th, 2005)
* Make string-keys locals assigns optional. Add documentation describing depreciated state [skaes@web.de]
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index fd7daa8b97..3bc83cd75a 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -2,7 +2,7 @@ module ActionPack
module Version #:nodoc:
MAJOR = 1
MINOR = 10
- TINY = 0
+ TINY = 1
STRING = [MAJOR, MINOR, TINY].join('.')
end