Merge branch 'master' of git.ucc.asn.au:/ipdf/code
authorSam Moore <matches@ucc.asn.au>
Wed, 26 Mar 2014 16:27:44 +0000 (00:27 +0800)
committerSam Moore <matches@ucc.asn.au>
Wed, 26 Mar 2014 16:27:44 +0000 (00:27 +0800)
commit0d33eac5144178de754ad9f53e39463f79a31398
tree8da24fbba7602c176fa40f39af32e3e789f545d0
parent42737c4c096f6469fb27e261806b48338a8f672f
parentefdd8b2a07dcf770e325ec1fc9b4b7d908331e23
Merge branch 'master' of git.ucc.asn.au:/ipdf/code

Conflicts:
src/main.cpp

Fixed that and also fixed other things.
src/Makefile
src/main.cpp

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