git@UCC - ipdf/code.git/commit

git.ucc.asn.au / ipdf / code.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 42737c4 efdd8b2)

author	Sam Moore <[email protected]>
	Wed, 26 Mar 2014 16:27:44 +0000 (00:27 +0800)
committer	Sam Moore <[email protected]>
	Wed, 26 Mar 2014 16:27:44 +0000 (00:27 +0800)
commit	0d33eac5144178de754ad9f53e39463f79a31398
tree	8da24fbba7602c176fa40f39af32e3e789f545d0	tree \| snapshot
parent	42737c4c096f6469fb27e261806b48338a8f672f	commit \| diff
parent	efdd8b2a07dcf770e325ec1fc9b4b7d908331e23	commit \| diff

Merge branch 'master' of git.ucc.asn.au:/ipdf/code

Conflicts:
src/main.cpp

Fixed that and also fixed other things.

src/Makefile	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history

Infinite Precision Document Formats - Code base

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