git.ucc.asn.au / tpg / opendispense2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e4ecce 9509d10)
Merge branch 'master' of serenade.mutabah.net:opendispense2
authorJohn Hodge <[email protected]>
Sun, 20 Feb 2011 08:25:26 +0000 (16:25 +0800)
committerJohn Hodge <[email protected]>
Sun, 20 Feb 2011 08:25:26 +0000 (16:25 +0800)
Conflicts:
src/server/handler_coke.c

1  2 
src/server/handler_coke.c patch | diff1 | diff2 | blob | history

diff --cc src/server/handler_coke.c
Simple merge
Yet another Dispense rewrite

UCC git Repository :: git.ucc.asn.au