projects / pspp-builds.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f79c311 04bc6ee)
Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 26 Nov 2008 04:28:36 +0000 (13:28 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 26 Nov 2008 04:28:36 +0000 (13:28 +0900)
Conflicts:

lib/gtksheet/automake.mk

1  2 
lib/gtksheet/automake.mk patch | diff1 | diff2 | blob | history

diff --cc lib/gtksheet/automake.mk
Simple merge
PSPP build tags.