[24081] trunk/base/ChangeLog

[source_changes at macosforge.org]

Revision: 24081
          http://trac.macosforge.org/projects/macports/changeset/24081
Author:   eridius at macports.org
Date:     2007-04-15 23:03:10 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
Add ChangeLog entry for new find command.
Convert jberry's ChangeLog entry to soft tabs

Modified Paths:
--------------
    trunk/base/ChangeLog

Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog	2007-04-16 05:59:30 UTC (rev 24080)
+++ trunk/base/ChangeLog	2007-04-16 06:03:10 UTC (rev 24081)
@@ -4,20 +4,24 @@
 #   This is a log of major user-visible changes in each release
 #
 
-	
+
 (unreleased):
 
-	- Add per-user preferences in ~/.macports/user.conf. This will be used
-	  for submitter information.
-	  Simplify selection of ports.conf file:
-	  	- ~/.portsrc is no longer supported.
-	  	- Search order for ports.conf is now:
-	  		- PORTSRC
-	  		- ~/.macports/ports.conf
-	  		- ${prefix}/etc/ports.conf
-	  	  Only the first file found will be parsed and used.
-	   (jberry r24071)
+<<<<<<< .mine
+    - Implement brand new find command in Pextlib.
+      See portfile.7 for documentation (eridius in r24079 and r24080).
 
+    - Add per-user preferences in ~/.macports/user.conf. This will be used
+      for submitter information.
+      Simplify selection of ports.conf file:
+        - ~/.portsrc is no longer supported.
+        - Search order for ports.conf is now:
+            - PORTSRC
+            - ~/.macports/ports.conf
+            - ${prefix}/etc/ports.conf
+          Only the first file found will be parsed and used.
+       (jberry r24071)
+
 Release 1.4.1 (14-Apr-2007):
 
     - Add responsive, reasonably fast http mirrors to openbsd group

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