Matthew Brush 088b0bc362 Merge branch 'master' into gtkbuilder
Conflicts:
	geany.glade
	src/Makefile.am
	src/callbacks.c
2011-12-05 20:52:00 -08:00
..
2011-10-19 03:38:26 +02:00
2009-02-27 14:06:21 +00:00
2011-10-23 13:44:52 -07:00
2011-10-23 13:44:52 -07:00
2011-10-19 03:38:26 +02:00
2011-10-23 13:44:52 -07:00
2011-10-23 13:44:52 -07:00
2011-10-23 13:44:52 -07:00
2011-11-13 01:05:24 +01:00
2011-10-23 13:44:52 -07:00
2011-10-23 13:44:52 -07:00
2011-10-23 13:44:52 -07:00