Merge branch 'gtkbuilder'
commit2d41ee941b6d65fb1c13999066829645d21b9165
authorMatthew Brush <matt@geany.org>
Sat, 10 Dec 2011 23:50:05 +0000 (10 15:50 -0800)
committerMatthew Brush <matt@geany.org>
Sat, 10 Dec 2011 23:50:05 +0000 (10 15:50 -0800)
treea26ad0d9aa6d44736adbf64ef97d22440ef7b477
parentfb1c6c63e609f9c1518c854537f19199d6d968e1
parent7d6731279f19f6f98e631af06a9b93647b16638b
Merge branch 'gtkbuilder'
src/main.c
src/makefile.win32