FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 29 Feb 2012 21:09:21 +0900] rev 16212
i18n-ja: synchronized with 87d37aceb5e3
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 24 Feb 2012 19:50:03 -0200] rev 16211
i18n-pt_BR: synchronized with 60101427d618
Brendan Cully <brendan@kublai.com> [Fri, 02 Mar 2012 10:43:06 -0800] rev 16210
Merge with stable
Brendan Cully <brendan@kublai.com> [Fri, 02 Mar 2012 10:42:12 -0800] rev 16209
setup.py: don't call splitlines twice on the output of xcodebuild (issue3277)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 02 Mar 2012 09:57:09 +0100] rev 16208
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 02 Mar 2012 09:54:45 +0100] rev 16207
merge stable heads
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2012 17:45:13 +0100] rev 16206
merge with stable
mercurial/filemerge.py in the default branch does not need the additional
unlink calls, because the unlink calls at the end of filemerge.filemerge()
are called for internal:dump, too.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2012 17:35:12 +0100] rev 16205
filemerge: remove temporary files when using internal:dump as merge-tool
Matt Mackall <mpm@selenic.com> [Thu, 01 Mar 2012 16:28:24 -0600] rev 16204
Added signature for changeset 53e2cd303ecf
Matt Mackall <mpm@selenic.com> [Thu, 01 Mar 2012 16:27:59 -0600] rev 16203
Added tag 2.1.1 for changeset 53e2cd303ecf