[Gnash-commit] gnash ChangeLog

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/13 16:39:19

Modified files:
        .              : ChangeLog 

Log message:
        reordered items somehow messed up by some conflict

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -b -r1.635 -r1.636
--- ChangeLog   13 Aug 2006 16:35:58 -0000      1.635
+++ ChangeLog   13 Aug 2006 16:39:18 -0000      1.636
@@ -1,37 +1,3 @@
-2006-08-12 Rob Savoye  <address@hidden>
-
-       * Makefile.am: Build klash if it's snabled, but the plugijn
-       isn't.
-       * backend/Makefile.am: Add lib dependancies for libgnashbase and
-       libgnashserver.
-       * gui/Makefile.am: Spell DEPENDANCIES right.
-       * libamf/Makefile.am: Make amftest only build for testing.
-       * libbase/Makefile.am: Add mor dependent libraries, add ogl.h to
-       the package.
-       * macros/kde.m4: Fix how KDE_LDFLAGS gets set.
-       * server/Makefile.am: Add lib dependancies for libgnashbase and
-       libgnashasobjs.
-       * server/asobj/Makefile.am: Add lib dependancies for libgnashbase and
-       libgnashamf.
-
-
-2006-08-10  Rob Savoye  <address@hidden>
-
-       * gui/Makefile.am: Add more libraries to AM_LDFLAGS.
-       * libamf/Makefile.am: Remove the rest of the amftest.
-       * libamf/amf.cpp, amf.h, rtmp.cpp, rtmp.h: Much rearranging of
-       code, plus additional code till libamf actually works now.
-       * libamf/rtmp.h: Use gnash namespace instead of rtmp one.
-       * libbase/log.h, log.cpp: Add support to hexify to optionally
-       print ascii characters in a hex dump.
-       * libbase/network.cpp: Add WriteNet().
-       * libbase/utility.h: Include math.h for Darwin.
-       * macros/gtkglext.m4: Use pkg-config if it exists.
-       * macros/kde.m4: Add -L to KDE_LDFLAGS.
-       * plugin/klash/klash.cpp: External variables are now defined
-       here.
-       * macros/pango.m4: Work around PPC Linux bug (YDL) with gtkglext
-       and pango library dependancies.
 
 2006-08-13 Sandro Santilli  <address@hidden>
 
@@ -51,7 +17,22 @@
        safely handle ActionScript code referencing '..' 
        from the root character.
 
->>>>>>> 1.633
+2006-08-12 Rob Savoye  <address@hidden>
+
+       * Makefile.am: Build klash if it's enabled, but the plugin
+       isn't.
+       * backend/Makefile.am: Add lib dependancies for libgnashbase and
+       libgnashserver.
+       * gui/Makefile.am: Spell DEPENDANCIES right.
+       * libamf/Makefile.am: Make amftest only build for testing.
+       * libbase/Makefile.am: Add mor dependent libraries, add ogl.h to
+       the package.
+       * macros/kde.m4: Fix how KDE_LDFLAGS gets set.
+       * server/Makefile.am: Add lib dependancies for libgnashbase and
+       libgnashasobjs.
+       * server/asobj/Makefile.am: Add lib dependancies for libgnashbase and
+       libgnashamf.
+
 2006-08-12  Sandro Santilli  <address@hidden>
 
        * server/Makefile.am, server/thread.h: removed duplicated code
@@ -77,6 +58,24 @@
        no actionscript operation should lead to crash player, including
        "x=new MyClass();". 
 
+2006-08-10  Rob Savoye  <address@hidden>
+
+       * gui/Makefile.am: Add more libraries to AM_LDFLAGS.
+       * libamf/Makefile.am: Remove the rest of the amftest.
+       * libamf/amf.cpp, amf.h, rtmp.cpp, rtmp.h: Much rearranging of
+       code, plus additional code till libamf actually works now.
+       * libamf/rtmp.h: Use gnash namespace instead of rtmp one.
+       * libbase/log.h, log.cpp: Add support to hexify to optionally
+       print ascii characters in a hex dump.
+       * libbase/network.cpp: Add WriteNet().
+       * libbase/utility.h: Include math.h for Darwin.
+       * macros/gtkglext.m4: Use pkg-config if it exists.
+       * macros/kde.m4: Add -L to KDE_LDFLAGS.
+       * plugin/klash/klash.cpp: External variables are now defined
+       here.
+       * macros/pango.m4: Work around PPC Linux bug (YDL) with gtkglext
+       and pango library dependancies.
+
 2006-08-10 Vitaly Alexeev <address@hidden>
        
        * gui\sdl.cpp, sdlsup.h: added key events handler and removed