Merge branch 'master' into rewrite-sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Tue, 11 Nov 2008 04:39:40 +0000 (13:39 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Tue, 11 Nov 2008 04:39:40 +0000 (13:39 +0900)
commitc3ac5a8af9c449072c7e872ca70a78c1755ae309
tree587ccf7e90d11ab10948b5edf588b8d241081759
parent31b6e78dc21a245350249247962d199ada98e677
parent0172359b97d990c1eacb3a9a0003c7142ba0b520
Merge branch 'master' into rewrite-sheet

Conflicts:

lib/gtksheet/automake.mk
po/en_GB.po
lib/gtksheet/automake.mk
po/en_GB.po
src/ui/gui/data-editor.c