diff options
| author | rillig <rillig> | 2009-07-26 21:28:45 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2009-07-26 21:28:45 +0000 |
| commit | 1742fa2e7db390573038345ba2b96361fdb8f723 (patch) | |
| tree | 2304882545a1463b744bcd00e01a8454ca8bc008 | |
| parent | d933781315f510b98d0360abdb1d28ec49f5266d (diff) | |
| download | pkgsrc-1742fa2e7db390573038345ba2b96361fdb8f723.tar.gz | |
Resolved conflicts.
| -rw-r--r-- | doc/CHANGES-2009 | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/doc/CHANGES-2009 b/doc/CHANGES-2009 index 2a7b885e754..7b7b2fdbc74 100644 --- a/doc/CHANGES-2009 +++ b/doc/CHANGES-2009 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2009,v 1.2849 2009/07/26 21:28:01 rillig Exp $ +$NetBSD: CHANGES-2009,v 1.2850 2009/07/26 21:28:45 rillig Exp $ Changes to the packages collection and infrastructure in 2009: @@ -3776,14 +3776,5 @@ Changes to the packages collection and infrastructure in 2009: Updated archivers/zziplib to 0.13.56 [minskim 2009-07-26] Updated www/php-eaccelerator to 0.9.5.3 [jdolecek 2009-07-26] Added lang/LuaJIT version 1.1.5 [rillig 2009-07-26] -<<<<<<< CHANGES-2009 - Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] - Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] - Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] - Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] - Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] - Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] -======= Updated archivers/php-zip to 5.2.10.1.0nb1 [minskim 2009-07-26] ->>>>>>> 1.2848 Added shells/dash version 0.5.5.1 [rillig 2009-07-26] |