summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updates for 2.6.2 release.Jean-Philippe Lang2015-02-192-1/+16
* Merged r14025 (#19120).Jean-Philippe Lang2015-02-181-1/+1
* Merged r14015 (#19065).Jean-Philippe Lang2015-02-182-2/+12
* Merged r13955 (#18961).Jean-Philippe Lang2015-02-181-8/+14
* Merged r13961 (#18922).Jean-Philippe Lang2015-02-181-1/+1
* Merged r13922 (#18896).Jean-Philippe Lang2015-02-182-3/+19
* Merged r13921 (#18894).Jean-Philippe Lang2015-02-182-1/+17
* Merged r13913, r13918 and r13919 (#18883).Jean-Philippe Lang2015-02-181-7/+7
* Merged r14014 (#17722).Jean-Philippe Lang2015-02-181-1/+1
* Merged r14016 (#19117).Jean-Philippe Lang2015-02-172-4/+4
* Merged r13943 from trunk to 2.6-stable (#18632)Toshi MARUYAMA2015-02-081-1/+1
* Merged r13977 from trunk to 2.6-stable (#10681, #18586)Toshi MARUYAMA2015-02-081-2/+4
* Merged r13976 from trunk to 2.6-stable (#10681, #18586)Toshi MARUYAMA2015-02-081-2/+7
* Merged r13729 from trunk to 2.6-stable (#16040, #18586, #10681)Toshi MARUYAMA2015-02-082-2/+2
* Merged r13880 from trunk to 2.6-stableToshi MARUYAMA2015-01-161-2/+0
* Merged r13874, updates for 2.6.1 release.Jean-Philippe Lang2015-01-112-1/+35
* Copyright update in 2.6-stable.Jean-Philippe Lang2015-01-11504-528/+528
* Merged r13870 from trunk to 2.6-stable (#18629)Toshi MARUYAMA2015-01-111-1/+1
* Merged r13615 (#18777).Jean-Philippe Lang2015-01-101-88/+10
* Merged r13860 (#18782).Jean-Philippe Lang2015-01-101-3/+3
* Merged r13861 and r13862 (#18789).Jean-Philippe Lang2015-01-102-1/+5
* Merged r13852 and r13853 (#18769).Jean-Philippe Lang2015-01-106-6/+6
* Merged r13850 (#18734).Jean-Philippe Lang2015-01-101-0/+1
* 2.6-stable: Gemfile: pin pg version 0.17 on all platformsToshi MARUYAMA2015-01-041-2/+1
* Merged r13836 from trunk to 2.6-stableToshi MARUYAMA2015-01-041-1/+0
* Merged r13835 from trunk to 2.6-stableToshi MARUYAMA2015-01-041-2/+2
* Merged r13831 from trunk to 2.6-stable.Toshi MARUYAMA2015-01-041-1/+1
* 2.6-stable: Gemfile: simplify rmagick version definitionToshi MARUYAMA2015-01-041-5/+1
* 2.6-stable: Gemfile: pin pg version 0.17 on Ruby 1.8.7 due to install errorToshi MARUYAMA2015-01-041-1/+2
* Merged r13829 from trunk to 2.6-stable.Toshi MARUYAMA2015-01-031-1/+1
* 2.6-stable: Gemfile: pin i18n version 0.6 on all platformsToshi MARUYAMA2015-01-031-1/+1
* Merged r13826 from trunk to 2.6-stable.Toshi MARUYAMA2015-01-031-0/+2
* Merged r13819 from trunk to 2.6-stable (#18587)Toshi MARUYAMA2015-01-031-32/+27
* 2.6-stable: fix r13807 on Ruby 1.8.7Toshi MARUYAMA2014-12-262-3/+11
* 2.6-stable: Gemfile: use i18n 0.6 on Ruby 1.8.7 and Ruby 1.9.2Toshi MARUYAMA2014-12-261-1/+1
* 2.6-stable: Gemfile: pin i18n and rmagick versions due to bundler error on Ru...Toshi MARUYAMA2014-12-261-1/+7
* Fixed order syntax for Rails 3 (#18667).Jean-Philippe Lang2014-12-261-1/+1
* Reverts r13805 (#18679).Jean-Philippe Lang2014-12-262-30/+1
* Merged r13807.Jean-Philippe Lang2014-12-262-1/+7
* Merged r13786 and r13789 (#18679).Jean-Philippe Lang2014-12-262-1/+30
* Merged r13768 (#18685).Jean-Philippe Lang2014-12-261-2/+2
* Merged r13787 (#18667).Jean-Philippe Lang2014-12-262-4/+15
* Merged r13785 (#18665).Jean-Philippe Lang2014-12-263-8/+29
* Merged r13677 (#18501).Jean-Philippe Lang2014-12-262-2/+16
* Merged r13670 (#18499).Jean-Philippe Lang2014-12-262-0/+12
* Merged r13659 (#18464).Jean-Philippe Lang2014-12-261-1/+2
* Merged r13784 (#14699).Jean-Philippe Lang2014-12-261-1/+1
* Merged r13684 from trunk to 2.6-stable (#18534, #18502)Toshi MARUYAMA2014-12-021-2/+2
* Merged r13638 (#18060).Jean-Philippe Lang2014-11-232-1/+6
* 2.6-stable: fix syntax error on Ruby 1.8.7 (#18280)Toshi MARUYAMA2014-11-221-1/+2