Merge with trunk
commit28d96a3909c5e43643b700fcacda0f5cc6595380
authorLex Trotman <elextr@gmail.com>
Fri, 24 Jul 2009 00:59:12 +0000 (24 00:59 +0000)
committerLex Trotman <elextr@gmail.com>
Fri, 24 Jul 2009 00:59:12 +0000 (24 00:59 +0000)
treef6c6f2b1b6f556faf40bef488d590adfb2cfe06e
parent4af6c2fd62c5db7fcdeefca11f8ca59c2ab1c748
parent5efdb0c776a9bd8d5083b471be12f743977c2400
Merge with trunk

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/build-system@4020 ea778897-0a13-0410-b9d1-a72fbfd435f5
ChangeLog
src/build.c
src/filetypes.c
src/keybindings.c
src/keybindings.h
src/keyfile.c
src/main.c
src/msgwindow.c
src/prefs.c