Merge branch 'krofna/master'
commitadfc0985dbc0e4c223051e6225e4863b79a43898
authorMatthew Brush <matt@geany.org>
Mon, 7 Jan 2013 03:11:17 +0000 (6 19:11 -0800)
committerMatthew Brush <matt@geany.org>
Mon, 7 Jan 2013 03:11:17 +0000 (6 19:11 -0800)
tree546af0f048d95de1d4ef738bc71ea58e485536ff
parentd236b40ce9e9898e2d904ff209aab00fee7720e1
parent15fddad323dbd28c147f987936161c09455029ae
Merge branch 'krofna/master'
data/geany.glade
src/keyfile.c
src/prefs.c