Public Git Hosting - geany-mirror.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 6099e8d c9a32bf)

commit	0a16ec75209bb6aa130119d10064e811b3423b95
author	Matthew Brush <matt@geany.org>
	Mon, 7 Nov 2011 07:44:24 +0000 (6 23:44 -0800)
committer	Matthew Brush <matt@geany.org>
	Mon, 7 Nov 2011 07:44:24 +0000 (6 23:44 -0800)
tree	441f07a6d2316847eb3a8828d0545c651aad1c94	tree \| snapshot (tar.gz zip)
parent	6099e8d3dfffb47ec1eddc1a720eb1af3e192427	commit \| diff
parent	c9a32bfdc9abe29c13c20eedd8b8142e625f6e76	commit \| diff

Merge branch 'master' into gtkbuilder

Conflicts:
src/interface.c
src/vte.c

src/callbacks.c	diff1 \|	diff2 \|	blob \| history
src/keybindings.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/prefs.c	diff1 \|	diff2 \|	blob \| history
src/project.c	diff1 \|	diff2 \|	blob \| history
src/stash.c	diff1 \|	diff2 \|	blob \| history
src/ui_utils.c	diff1 \|	diff2 \|	blob \| history
src/ui_utils.h	diff1 \|	diff2 \|	blob \| history
src/vte.c	diff1 \|	diff2 \|	blob \| history

A fast and lightweight IDE