git.ucc.asn.au / tpg / opendispense2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b45406d 3e1c2bf)
Merge branch 'master' of git://mutabah.net/opendispense2
authorJohn Hodge <[email protected]>
Sun, 20 Feb 2011 05:52:10 +0000 (13:52 +0800)
committerJohn Hodge <[email protected]>
Sun, 20 Feb 2011 05:52:10 +0000 (13:52 +0800)
1  2 
src/server/server.c patch | diff1 | diff2 | blob | history

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

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