Merge branch 'master' into rewrite-sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 4 Dec 2008 00:14:35 +0000 (09:14 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 4 Dec 2008 00:14:35 +0000 (09:14 +0900)
commit2165f59ab9eee5272b4037e45477811627cae078
tree9668cb55d268a5153eb79c94e97953ad6a55f468
parent3e3468c33112e7430f3fc0e1e7eca06b29ee9c0e
parent7f37cbe10c05cf3b046452691eb4a3d821c3ae7c
Merge branch 'master' into rewrite-sheet

Conflicts:

src/ui/gui/psppire-case-file.c
src/ui/gui/psppire-case-file.h
src/ui/gui/find-dialog.c