projects / pspp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 659c54c 3676866)
Merge branch 'master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 9 May 2013 17:39:15 +0000 (19:39 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 9 May 2013 17:39:15 +0000 (19:39 +0200)
Conflicts:
src/ui/gui/psppire-cell-renderer-button.c


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