projects / pspp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e4f9e9 2d6d9b3)
Merge remote branch 'origin/master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 15 May 2013 17:02:45 +0000 (19:02 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 15 May 2013 17:02:45 +0000 (19:02 +0200)
Conflicts:
src/ui/gui/page-assistant.c


Trivial merge
Unnamed repository; edit this file to name it for gitweb.