[Pkg-mc-commits] r420 - trunk/debian

[Yury Zaytsev]

Author: zaytsev-guest
Date: 2010-06-06 17:18:50 +0000 (Sun, 06 Jun 2010)
New Revision: 420

Modified:
   trunk/debian/changelog
Log:
Conflict.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-06-06 17:15:48 UTC (rev 419)
+++ trunk/debian/changelog	2010-06-06 17:18:50 UTC (rev 420)
@@ -7,7 +7,7 @@
   [Denis Briand]
   * Created debian/lintian directory.
   * Created debian/extra/icon directory.
-  * Renamed icon.xpm to debian/extra/icon/mc.xpm.
+  * Moved debian/extra/icon.xpm to debian/extra/icon/mc.xpm.
 
  -- Denis Briand <denis at narcan.fr>  Sun, 06 Jun 2010 19:11:39 +0200