Merge with trunk
commit9164392983559df76154b967034bab52ee2eea84
authorLex Trotman <elextr@gmail.com>
Fri, 17 Jul 2009 04:55:35 +0000 (17 04:55 +0000)
committerLex Trotman <elextr@gmail.com>
Fri, 17 Jul 2009 04:55:35 +0000 (17 04:55 +0000)
treebd31aeeb4f3ef815c9a6b42d5369ed90855f4a5f
parent3bc23327f59ae01b30c69c0e18f6c71026dc58f7
parent9af1f7c78a0b37f237a6ee4090066441dec4b5bf
Merge with trunk

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/build-system@3983 ea778897-0a13-0410-b9d1-a72fbfd435f5
12 files changed:
ChangeLog
doc/geany.html
doc/geany.txt
geany.glade
src/filetypes.c
src/filetypes.h
src/interface.c
src/keybindings.c
src/keybindings.h
src/keyfile.c
src/main.c
src/prefs.c