]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
projects / sojka / lightdm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7fb71f 7230ac7)
Merge from trunk
authorMichael Terry <michael.terry@canonical.com>
Fri, 7 Feb 2014 17:13:13 +0000 (12:13 -0500)
committerMichael Terry <michael.terry@canonical.com>
Fri, 7 Feb 2014 17:13:13 +0000 (12:13 -0500)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history
src/session-child.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
index 766ef679dd34ec588b73c491c14c9bc71f088c8e,117eb137e869d9df899cad603494fb95872937fe..08222cf30d49cbb89c3630495214db79dcd0bc53
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -72,9 -78,8 +72,9 @@@ lightdm_SOURCES = 
        xdmcp-session-private.h
  
  lightdm_CFLAGS = \
-       $(LIGHTDM_CFLAGS) \
        $(WARN_CFLAGS) \
+       $(LIGHTDM_CFLAGS) \
 +      -I"$(top_srcdir)/common" \
        -DSBIN_DIR=\"$(sbindir)\" \
        -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \
        -DLOG_DIR=\"$(localstatedir)/log/lightdm\" \
diff --cc src/session-child.c
Simple merge