diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html index 903c7e8c97ad97dd579de976d4e62dd7af4965b4_Y29udHJpYi93aW4zMi9SZWFkTWUuaHRtbA==..8fe5fc8d7b8e4eec6d392c9dec0a4385d4270082_Y29udHJpYi93aW4zMi9SZWFkTWUuaHRtbA== 100644 --- a/contrib/win32/ReadMe.html +++ b/contrib/win32/ReadMe.html @@ -140,7 +140,7 @@ </p> <p> - Mercurial is Copyright 2005-2014 Matt Mackall and others. See + Mercurial is Copyright 2005-2015 Matt Mackall and others. See the <tt>Contributors.txt</tt> file for a list of contributors. </p> diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss index 903c7e8c97ad97dd579de976d4e62dd7af4965b4_Y29udHJpYi93aW4zMi9tZXJjdXJpYWwuaXNz..8fe5fc8d7b8e4eec6d392c9dec0a4385d4270082_Y29udHJpYi93aW4zMi9tZXJjdXJpYWwuaXNz 100644 --- a/contrib/win32/mercurial.iss +++ b/contrib/win32/mercurial.iss @@ -21,7 +21,7 @@ #endif [Setup] -AppCopyright=Copyright 2005-2010 Matt Mackall and others +AppCopyright=Copyright 2005-2015 Matt Mackall and others AppName=Mercurial #if ARCH == "x64" AppVerName=Mercurial {#VERSION} (64-bit) @@ -44,7 +44,7 @@ DefaultDirName={pf}\Mercurial SourceDir=..\.. VersionInfoDescription=Mercurial distributed SCM (version {#VERSION}) -VersionInfoCopyright=Copyright 2005-2010 Matt Mackall and others +VersionInfoCopyright=Copyright 2005-2015 Matt Mackall and others VersionInfoCompany=Matt Mackall and others InternalCompressLevel=max SolidCompression=true diff --git a/contrib/wix/COPYING.rtf b/contrib/wix/COPYING.rtf index 317422642526a951405f50ba6bbfe74b8c0e8efc..1e7901519fdae09596c98bf7ca8bf2e81461da1e GIT binary patch literal 1686 zc$|$@-*4MC5Z-fu{tt(~tSvHIQsalt!vL>H8l#D0*bWK<e4!=Ex|JdolCohK{@-^; z$%~5t+kk+vtmAz@?jwB^E|jT|#$#OaW}9ZCOcbgt6JE76+ce2;j-s?CgpH;Ti6{+f zQRbC&UWEi!SSt@RwTFeRr5T@2Z?29ax7s?|0b}7*k%+BR$|Pc=Ta}GQ<5=@SY?V<? z2J7I_mq8U6U^KW%2O0g1l27B4*rD2gM^oI0Hcv$(T_H4%(oDFxdY#=QwAQT-sd)KQ zbd*1Sj6{8wz@u_`>riSCKg&;$CCTWQEJ;W3C_|tn|1Px#X$r8RQqD8Ro2%Eg!%HJx zD!ily|3JL}K@TNK1#io+mrjl0U|Yzg0kQ#oaJXrM0uoA)LlR!w0?Pw`(V9XzAQBLi zt3B8<K75%y!<XojhIzZun8O3+%6J9RL&M+rN)@m<#PT~vU-sy5XQ`_UXw4WDvOw68 zNP33s4A6JG24eG01}5ylHoWOQu{?m5;dS4jvt~sb8)vsp5>rNc6;}Y7*toI{X{o3s zJsn_=Wb{Ts>s8t6YoJ>AHeKC6J+ELgTf?`>VlkPm)?=y+m8G|8r@Bs9HyWuiX>!tp z15<yzU3|W$`pF;Dhv{m~?C++l+3j)(cTWqLz<jb;O+P<BOcpSIUd*4Cw>|f%0b^rx zHeD<4X*e$}y3R$}5LhlZT9NWS_m!O90)k~_dxrtdwv)s5<hD6D+*W}EYZ_rRl3&C? z0YMVsePyARhx54m;s20{aAD~+8>KOlAXv^&N%e)S<yO&KG`VgIrolknF(ONSqjKaA z^d1Y+N135*xuyBOwDimo?VHfl&~pcNx{m^lhU?MD4QeFXgw5YwQiFG|;5<TO12L^J zbPj3jV{|EX5+Y^#zfoN66em39L*{f|C{|p-JBW^NeUNCn8L(i>hXGv?9Ym^NTcMPw zTgqF{_-|GOO>v7oIX;&I=u6&TcY(r^u=1*(7I(cIR7HnsLw6O(VuzmCoPmfX_O95z zL+@lCtEE!^bzsYQ;Q6#D(yGrp*QC}{;&nmrJ4Ht23U`DpW4Qj$O`vUzBnc<a{8{su z#nON%8AR^4Dum|O;c&m-54NTqShpSOu7Mx^-gBWV9+fWmb}lsy*@xr(dVafjn9jb! w+rC46zV8NJX=N}U<hFi$IvshB^Ew<wt3_U>@NXMVr_=eG?y%`s;is#=09<fVlK=n! diff --git a/mercurial/commands.py b/mercurial/commands.py index 903c7e8c97ad97dd579de976d4e62dd7af4965b4_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..8fe5fc8d7b8e4eec6d392c9dec0a4385d4270082_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644 --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -6313,7 +6313,7 @@ % util.version()) ui.status(_( "(see http://mercurial.selenic.com for more information)\n" - "\nCopyright (C) 2005-2014 Matt Mackall and others\n" + "\nCopyright (C) 2005-2015 Matt Mackall and others\n" "This is free software; see the source for copying conditions. " "There is NO\nwarranty; " "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" diff --git a/mercurial/help/hg.1.txt b/mercurial/help/hg.1.txt index 903c7e8c97ad97dd579de976d4e62dd7af4965b4_bWVyY3VyaWFsL2hlbHAvaGcuMS50eHQ=..8fe5fc8d7b8e4eec6d392c9dec0a4385d4270082_bWVyY3VyaWFsL2hlbHAvaGcuMS50eHQ= 100644 --- a/mercurial/help/hg.1.txt +++ b/mercurial/help/hg.1.txt @@ -112,7 +112,7 @@ Copying """"""" -Copyright (C) 2005-2014 Matt Mackall. +Copyright (C) 2005-2015 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff --git a/mercurial/help/hgignore.5.txt b/mercurial/help/hgignore.5.txt index 903c7e8c97ad97dd579de976d4e62dd7af4965b4_bWVyY3VyaWFsL2hlbHAvaGdpZ25vcmUuNS50eHQ=..8fe5fc8d7b8e4eec6d392c9dec0a4385d4270082_bWVyY3VyaWFsL2hlbHAvaGdpZ25vcmUuNS50eHQ= 100644 --- a/mercurial/help/hgignore.5.txt +++ b/mercurial/help/hgignore.5.txt @@ -26,7 +26,7 @@ Copying ======= This manual page is copyright 2006 Vadim Gelfer. -Mercurial is copyright 2005-2014 Matt Mackall. +Mercurial is copyright 2005-2015 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff --git a/mercurial/help/hgrc.5.txt b/mercurial/help/hgrc.5.txt index 903c7e8c97ad97dd579de976d4e62dd7af4965b4_bWVyY3VyaWFsL2hlbHAvaGdyYy41LnR4dA==..8fe5fc8d7b8e4eec6d392c9dec0a4385d4270082_bWVyY3VyaWFsL2hlbHAvaGdyYy41LnR4dA== 100644 --- a/mercurial/help/hgrc.5.txt +++ b/mercurial/help/hgrc.5.txt @@ -34,7 +34,7 @@ Copying ======= This manual page is copyright 2005 Bryan O'Sullivan. -Mercurial is copyright 2005-2014 Matt Mackall. +Mercurial is copyright 2005-2015 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff --git a/setup.py b/setup.py index 903c7e8c97ad97dd579de976d4e62dd7af4965b4_c2V0dXAucHk=..8fe5fc8d7b8e4eec6d392c9dec0a4385d4270082_c2V0dXAucHk= 100644 --- a/setup.py +++ b/setup.py @@ -555,7 +555,7 @@ if py2exeloaded: extra['console'] = [ {'script':'hg', - 'copyright':'Copyright (C) 2005-2010 Matt Mackall and others', + 'copyright':'Copyright (C) 2005-2015 Matt Mackall and others', 'product_version':version}] # sub command of 'build' because 'py2exe' does not handle sub_commands build.sub_commands.insert(0, ('build_hgextindex', None)) diff --git a/tests/test-help.t b/tests/test-help.t index 903c7e8c97ad97dd579de976d4e62dd7af4965b4_dGVzdHMvdGVzdC1oZWxwLnQ=..8fe5fc8d7b8e4eec6d392c9dec0a4385d4270082_dGVzdHMvdGVzdC1oZWxwLnQ= 100644 --- a/tests/test-help.t +++ b/tests/test-help.t @@ -411,7 +411,7 @@ Mercurial Distributed SCM (version *) (glob) (see http://mercurial.selenic.com for more information) - Copyright (C) 2005-2014 Matt Mackall and others + Copyright (C) 2005-2015 Matt Mackall and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/tests/test-hgrc.t b/tests/test-hgrc.t index 903c7e8c97ad97dd579de976d4e62dd7af4965b4_dGVzdHMvdGVzdC1oZ3JjLnQ=..8fe5fc8d7b8e4eec6d392c9dec0a4385d4270082_dGVzdHMvdGVzdC1oZ3JjLnQ= 100644 --- a/tests/test-hgrc.t +++ b/tests/test-hgrc.t @@ -71,7 +71,7 @@ Mercurial Distributed SCM (version *) (glob) (see http://mercurial.selenic.com for more information) - Copyright (C) 2005-2014 Matt Mackall and others + Copyright (C) 2005-2015 Matt Mackall and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ unset FAKEPATH