Revision: 110433 https://trac.macports.org/changeset/110433 Author: larryv@macports.org Date: 2013-08-30 20:43:57 -0700 (Fri, 30 Aug 2013) Log Message: ----------- [svn-subports] Merge r110427 from trunk, regenerating config_impl.h.patch. Revision Links: -------------- https://trac.macports.org/changeset/110427 Modified Paths: -------------- branches/larryv-subversion-subports/dports/devel/subversion/files/config_impl.h.patch Property Changed: ---------------- branches/larryv-subversion-subports/dports/devel/subversion/files/config_impl.h.patch Modified: branches/larryv-subversion-subports/dports/devel/subversion/files/config_impl.h.patch =================================================================== --- branches/larryv-subversion-subports/dports/devel/subversion/files/config_impl.h.patch 2013-08-31 03:39:31 UTC (rev 110432) +++ branches/larryv-subversion-subports/dports/devel/subversion/files/config_impl.h.patch 2013-08-31 03:43:57 UTC (rev 110433) @@ -1,6 +1,6 @@ --- subversion/libsvn_subr/config_impl.h.orig 2011-02-12 00:18:15.000000000 +1100 +++ subversion/libsvn_subr/config_impl.h 2012-02-21 21:07:53.000000000 +1100 -@@ -121,7 +121,7 @@ svn_error_t *svn_config__parse_registry( +@@ -131,7 +131,7 @@ svn_error_t *svn_config__parse_registry( # define SVN_CONFIG__SYS_DIRECTORY "subversion" # define SVN_CONFIG__USR_DIRECTORY "subversion" #else /* ! WIN32 && ! __HAIKU__ */ Property changes on: branches/larryv-subversion-subports/dports/devel/subversion/files/config_impl.h.patch ___________________________________________________________________ Added: svn:mergeinfo + /branches/mld-qt-481/dports/devel/subversion/files/config_impl.h.patch:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/devel/subversion/files/config_impl.h.patch:109117-110432 /users/cal/ports/devel/subversion/files/config_impl.h.patch:96570-97031