]> git.nickg.me.uk Git - xcowsay.git/commit
Merge branch 'master' of ssh://vds/home/nick/xcowsay
authorNick Gasson <nick@nickg.me.uk>
Sat, 2 Oct 2010 19:50:31 +0000 (20:50 +0100)
committerNick Gasson <nick@nickg.me.uk>
Sat, 2 Oct 2010 19:50:31 +0000 (20:50 +0100)
commitfa326c5e965cce97b7ec025542adc6932cc77d44
treec84bb9a0ffbf354f780292e50e68c42c709f926a
parente2295b06bb864a1dd798755fa76a602468a4627a
parentd28a3b8c51ad11ec7aae94cd8812fcaab33c5728
Merge branch 'master' of ssh://vds/home/nick/xcowsay

Conflicts:
ChangeLog
src/display_cow.c
ChangeLog
config.h.in
configure.ac
src/display_cow.c
src/xcowsay.c