projects / pspp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 157d638 5240f69)
Merge remote branch 'origin/master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 28 Apr 2013 13:40:42 +0000 (15:40 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 28 Apr 2013 13:40:42 +0000 (15:40 +0200)
1  2 
src/ui/gui/page-file.c patch | diff1 | diff2 | blob | history

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