packages: charles/charles.spec - ups

[arekm]

Author: arekm                        Date: Fri Oct 30 09:20:56 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ups

---- Files affected:
packages/charles:
   charles.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/charles/charles.spec
diff -u packages/charles/charles.spec:1.5 packages/charles/charles.spec:1.6
--- packages/charles/charles.spec:1.5	Fri Oct 30 10:20:31 2009
+++ packages/charles/charles.spec	Fri Oct 30 10:20:50 2009
@@ -1,4 +1,3 @@
-<<<<<<< charles.spec
 # $Revision$, $Date$
 
 %include	/usr/lib/rpm/macros.java
@@ -66,6 +65,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2009/10/30 09:20:50  arekm
+- ups
+
 Revision 1.5  2009/10/30 09:20:31  arekm
 - works on x86_64, too
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/charles/charles.spec?r1=1.5&r2=1.6&f=u