conflict resolve

1 files changed, 21 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index dfbefedc323..3468e70386d 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,24 @@
+2013-03-21  Eric Ludlam  <zappo@gnu.org>
+
+        * srecode/ede-autoconf.srt: Change Copyright to FSF.
+        (ede-empty): Change AC_INIT to use PROJECT_NAME, and
+        PROJECT_VERSION.
+
+        * srecode/ede-make.srt (ede-empty): Add a dependency on :project.
+        Add header comment specifying the project's relative path.
+
+        * srecode/c.srt (header_guard): Upcase the filename symbol.
+
+2013-03-21  Vladimir Kazanov <vkazanov@inbox.ru>
+
+        * srecode/java.srt (empty-main): New.
+        (class-tag): Decapitalize class.
+
+2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867).
+        * PROBLEMS: Mention problem with ImageMagick 6.8.2-3 through 6.8.3-9.
+
 2013-03-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         Add coding tags for iso-2022-7bit files that are not already tagged.