]> Pileus Git - ~andy/gtk/commitdiff
projects / ~andy / gtk / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80f3323 144c3fd)
Merge branch 'master' into broadway
authorAlexander Larsson <alexl@redhat.com>
Sat, 4 Dec 2010 21:31:15 +0000 (22:31 +0100)
committerAlexander Larsson <alexl@redhat.com>
Sat, 4 Dec 2010 21:31:15 +0000 (22:31 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
gdk/Makefile.am patch | diff1 | diff2 | blob | history
gtk/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc gdk/Makefile.am
Simple merge
diff --cc gtk/Makefile.am
Simple merge
Andy's GTK+ repository