[Gnash-commit] gnash ChangeLog

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/13 09:52:26

Modified files:
        .              : ChangeLog 

Log message:
        removed conflict lines, wrap to 80 cols, corrected indent

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1186&r2=1.1187

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1186
retrieving revision 1.1187
diff -u -b -r1.1186 -r1.1187
--- ChangeLog   13 Oct 2006 09:42:39 -0000      1.1186
+++ ChangeLog   13 Oct 2006 09:52:26 -0000      1.1187
@@ -21,7 +21,8 @@
        
 2006-10-12 Udo Giacomozzi <address@hidden>
   
-       * render_handler_agg.cpp, gui/fb.cpp: Implemented clipping for AGG 
backend 
+       * render_handler_agg.cpp, gui/fb.cpp: Implemented clipping for
+         AGG backend 
 
 2006-10-12  Rob Savoye  <address@hidden>
 
@@ -175,7 +176,6 @@
        * configure.ac, Makefile.am, macros/agg.m4: report need for
          AGG compatibility layer.
 
->>>>>>> 1.1167
 2006-10-11 Sandro Santilli <address@hidden>
 
        * macros/gtkglext.m4: added missing -L to GLEXT_LIBS when
@@ -232,7 +232,6 @@
          moved matrix class in its own files and added/fixed
          documentation.
 
->>>>>>> 1.1146
 2006-10-11 Markus Gothe <address@hidden>
 
        * macros/agg.m4: Added /usr/pkg/include.