1 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index cc20925..ee81684 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -88,6 +88,13 @@
           modified:   linden/install.xml
 
 
+2009-11-18 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Cleaned up a harmless bad merge in llimagej2coj.cpp.
+        
+          modified:   linden/indra/llimagej2coj/llimagej2coj.cpp
+
+
 2009-11-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * Fixed a warning about converting string literal to gchar*.