]> git.nickg.me.uk Git - xcowsay.git/commit
Merge branch 'left-bubble'
authorNick Gasson <nick@nickg.me.uk>
Sat, 6 Nov 2010 15:11:14 +0000 (15:11 +0000)
committerNick Gasson <nick@nickg.me.uk>
Sat, 6 Nov 2010 15:11:14 +0000 (15:11 +0000)
commit01ee27fdfe881ac7e0f45c9ecc721eaaa722f6f3
treeb02f8bad5ddb0966d3637d723af4878dfda390c2
parent752b7e2bf63f87c08e0314224c0f198fcb027b16
parentcb7f043b11d4b45d0cf310247349c9dc8efd9bc3
Merge branch 'left-bubble'

Conflicts:
ChangeLog
ChangeLog
src/display_cow.c
src/xcowsay.c