projects / pspp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72b86e2 edcc44c)
Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 7 Apr 2016 11:30:01 +0000 (13:30 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 7 Apr 2016 11:30:01 +0000 (13:30 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/data/variable.c patch | diff1 | diff2 | blob | history

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