Merge branch 'gtk3-support'
commit35cc441b74dc8103144d09c429f5da5c11770680
authorColomban Wendling <ban@herbesfolles.org>
Sun, 10 Mar 2013 16:20:25 +0000 (10 17:20 +0100)
committerColomban Wendling <ban@herbesfolles.org>
Sun, 10 Mar 2013 16:20:25 +0000 (10 17:20 +0100)
treebd636a839a941adb78c510ccff3a8e59b91bc9b0
parent7e3a235436729313d63c8e118c61eed626be1fb1
parente0104a4bc26461b848c61c06cf885a3b6adf469e
Merge branch 'gtk3-support'

Conflicts:
src/ui_utils.c
configure.ac
src/build.c
src/document.c
src/editor.c
src/keybindings.c
src/ui_utils.c
src/ui_utils.h