aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-10-25 22:11:48 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-10-25 22:11:48 +0000
commitc7a6b9862dca37fd393a7585f850dfb46725ad40 (patch)
treea135a8b2e00f10d9b71e669b9d46fbc710d86e41 /actionmailer
parent06303ed34eea1f9c3dfa8c7d0ada186b0faf648f (diff)
downloadrails-c7a6b9862dca37fd393a7585f850dfb46725ad40.tar.gz
rails-c7a6b9862dca37fd393a7585f850dfb46725ad40.tar.bz2
rails-c7a6b9862dca37fd393a7585f850dfb46725ad40.zip
Prepared for release of 0.14.2 (RC3)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2737 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG5
-rwxr-xr-xactionmailer/Rakefile2
-rw-r--r--actionmailer/lib/action_mailer/version.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 16d7d3b318..7a1c1c664c 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,3 +1,8 @@
+*1.1.2* (October 26th, 2005)
+
+* Upgraded to Action Pack 1.10.2
+
+
*1.1.1* (October 19th, 2005)
* Upgraded to Action Pack 1.10.1
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index d6cbbf73d7..58fd70ffdc 100755
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -53,7 +53,7 @@ spec = Gem::Specification.new do |s|
s.rubyforge_project = "actionmailer"
s.homepage = "http://www.rubyonrails.org"
- s.add_dependency('actionpack', '= 1.10.1' + PKG_BUILD)
+ s.add_dependency('actionpack', '= 1.10.2' + PKG_BUILD)
s.has_rdoc = true
s.requirements << 'none'
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 4dbc364e20..e13bf35fca 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -2,7 +2,7 @@ module ActionMailer
module Version #:nodoc:
MAJOR = 1
MINOR = 1
- TINY = 1
+ TINY = 2
STRING = [MAJOR, MINOR, TINY].join('.')
end