projects / pspp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8d5251 a74cf2a)
Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Mon, 15 Aug 2016 12:16:26 +0000 (14:16 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Mon, 15 Aug 2016 12:16:26 +0000 (14:16 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/ui/gui/psppire-data-editor.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/ui/gui/psppire-data-editor.c
Simple merge
Unnamed repository; edit this file to name it for gitweb.