[27648] branches/release_1_5/base

[source_changes at macosforge.org]

Revision: 27648
          http://trac.macosforge.org/projects/macports/changeset/27648
Author:   jmpp at macports.org
Date:     2007-08-11 00:10:07 -0700 (Sat, 11 Aug 2007)

Log Message:
-----------
Merged revisions 26683-26692,26695-26708,26712-26718,26720,26724-26729,26732-26736,26738-26743,26745-26752,26754-26764,26766-26803,26805,26807-26808,26810,26815-26828,26830-26841,26843-26849,26852-26862,26867-26869,26871-26902,26904-26920,26922-26936,26938-26939,26941,26943-26975,26977-27017,27019-27020,27023,27027-27042,27045-27052,27054-27064,27066-27078,27081-27109,27111-27121,27123-27126,27128-27139,27141-27198,27200,27203-27294,27298-27312,27314-27378,27380-27404,27406-27414,27416-27509,27511-27517,27529-27616,27619,27623-27641,27643,27645-27647 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r27647 | jmpp at macports.org | 2007-08-11 03:07:27 -0400 (Sat, 11 Aug 2007) | 5 lines
  
  
  Had the perfect strategy to keep the ChangeLog in sync between trunk and release_1_5
  and both in sycn wrt the 1.5.1 release rev... but a typo had other plans, sigh!
........

Modified Paths:
--------------
    branches/release_1_5/base/ChangeLog

Property Changed:
----------------
    branches/release_1_5/base/


Property changes on: branches/release_1_5/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27644
   + /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27647

Modified: branches/release_1_5/base/ChangeLog
===================================================================
--- branches/release_1_5/base/ChangeLog	2007-08-11 07:07:27 UTC (rev 27647)
+++ branches/release_1_5/base/ChangeLog	2007-08-11 07:10:07 UTC (rev 27648)
@@ -4,7 +4,7 @@
 ###
 
 
-Release 1.5.1 (11-August-2007 at branches/release_1_5/base's r27626, by jmpp):
+Release 1.5.1 (11-August-2007 at branches/release_1_5/base's r27646, by jmpp):
 
     - Remove sed rules taking care of dp based comments in the macports.conf file from the upgrade target in base/Makefile.in,
       they were causing problems for people with /opt/dports or similar prefixes (jmpp in r27618).

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070811/53881028/attachment.html