projects / pspp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 368a055 50652d2)
Merge "master" into "psppsheet" to obtain bug fixes from "master". 20120709001830/pspp 20120710001843/pspp
authorBen Pfaff <blp@cs.stanford.edu>
Mon, 9 Jul 2012 05:18:20 +0000 (22:18 -0700)
committerBen Pfaff <blp@cs.stanford.edu>
Mon, 9 Jul 2012 05:18:20 +0000 (22:18 -0700)
1  2 
src/ui/gui/psppire-data-window.c patch | diff1 | diff2 | blob | history
src/ui/gui/text-data-import-dialog.c patch | diff1 | diff2 | blob | history

diff --cc src/ui/gui/psppire-data-window.c
Simple merge
diff --cc src/ui/gui/text-data-import-dialog.c
Simple merge
Unnamed repository; edit this file to name it for gitweb.