projects / pspp-builds.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8953baa ef60a82)
Merge branch 'master' of /home/john/Development/pspp-window-manager
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 20 Feb 2009 01:26:17 +0000 (10:26 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 20 Feb 2009 01:26:17 +0000 (10:26 +0900)
Conflicts:

src/ui/gui/crosstabs-dialog.c
src/ui/gui/helper.c

1  2 
src/ui/gui/psppire.c patch | diff1 | diff2 | blob | history

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