projects / pspp-builds.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e3468c 7f37cbe)
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)
Conflicts:

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

1  2 
src/ui/gui/find-dialog.c patch | diff1 | diff2 | blob | history

diff --cc src/ui/gui/find-dialog.c
Simple merge
PSPP build tags.