Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : apps/e

Dir     : e17/apps/e/po


Modified Files:
        ChangeLog 


Log Message:
More SPLIT merging.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ChangeLog   21 Apr 2002 07:22:58 -0000      1.12
+++ ChangeLog   15 Jan 2003 18:29:54 -0000      1.13
@@ -98,32 +98,6 @@
 
        * Makefile.in.in: Upgrade to gettext-0.10.39.
 
-<<<<<<< ChangeLog
-2001-10-08  gettextize  <[EMAIL PROTECTED]>
-
-       * Makefile.in.in: Upgrade to gettext-0.10.39.
-
-2001-10-08  gettextize  <[EMAIL PROTECTED]>
-
-       * Makefile.in.in: Upgrade to gettext-0.10.39.
-
-2001-09-25  gettextize  <[EMAIL PROTECTED]>
-
-       * Makefile.in.in: Upgrade to gettext-0.10.39.
-
-2001-09-25  gettextize  <[EMAIL PROTECTED]>
-
-       * Makefile.in.in: Upgrade to gettext-0.10.39.
-
-2001-09-10  gettextize  <[EMAIL PROTECTED]>
-
-       * Makefile.in.in: Upgrade to gettext-0.10.39.
-
-2001-09-10  gettextize  <[EMAIL PROTECTED]>
-
-       * Makefile.in.in: Upgrade to gettext-0.10.39.
-
-=======
 2001-10-09  gettextize  <[EMAIL PROTECTED]>
 
        * Makefile.in.in: Upgrade to gettext-0.10.40.
@@ -132,7 +106,6 @@
 
        * Makefile.in.in: Upgrade to gettext-0.10.40.
 
->>>>>>> 1.6
 2001-08-31  gettextize  <[EMAIL PROTECTED]>
 
        * Makefile.in.in: Upgrade to gettext-0.10.39.




-------------------------------------------------------
This SF.NET email is sponsored by: A Thawte Code Signing Certificate 
is essential in establishing user confidence by providing assurance of 
authenticity and code integrity. Download our Free Code Signing guide:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0028en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to