projects / sxemacs / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 571fb34 a17da6c)
Merge branch 'master' into dbus
authorSteve Youngs <steve@sxemacs.org>
Sat, 28 Jan 2012 13:56:28 +0000 (23:56 +1000)
committerSteve Youngs <steve@sxemacs.org>
Sat, 28 Jan 2012 13:56:28 +0000 (23:56 +1000)
Conflicts:
modules/dbus/Makefile.am  Trivial, resolved.

Signed-off-by: Steve Youngs <steve@sxemacs.org>
1  2 
configure.ac patch | diff1 | diff2 | blob | history
modules/Makefile.am patch | diff1 | diff2 | blob | history
modules/dbus/Makefile.am patch | diff1 | diff2 | blob | history
src/elhash.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc modules/Makefile.am
Simple merge
diff --cc modules/dbus/Makefile.am
index a4bdbe0,597c2ff..8a3d501
--- 1/modules/dbus/Makefile.am
--- 2/modules/dbus/Makefile.am
+++ b/modules/dbus/Makefile.am
@@@ -92,4 -76,7 +92,3 @@@ SUFFIXES = .doc.
  .c.s:
        $(COMPILE) -S -c $(cflags) $<
  
 -## all the mods
 -module_LTLIBRARIES =
--
 -BUILT_SOURCES =
diff --cc src/elhash.c
Simple merge
SXEmacs