projects / pspp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55c55aa 5ea81ae)
Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 10 Jul 2016 05:47:34 +0000 (07:47 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 10 Jul 2016 05:47:34 +0000 (07:47 +0200)
1  2 
src/ui/gui/automake.mk patch | diff1 | diff2 | blob | history
src/ui/gui/widgets.c patch | diff1 | diff2 | blob | history

diff --cc src/ui/gui/automake.mk
Simple merge
diff --cc src/ui/gui/widgets.c
Simple merge
Unnamed repository; edit this file to name it for gitweb.