Merge branch 'master' of git.ucc.asn.au:/ipdf/code
authorSam Moore <matches@ucc.asn.au>
Thu, 17 Apr 2014 06:31:36 +0000 (14:31 +0800)
committerSam Moore <matches@ucc.asn.au>
Thu, 17 Apr 2014 06:31:36 +0000 (14:31 +0800)
commit029e93dad12c51c69e47aa74dcc39f84d315bca3
tree4862de7012b126a31a84972e9a906dc2dffec217
parent4f0feb025e48aaaa0ffe0226c5135e116d1cb986
parentb1786b24148036a4d9402cc12ea97466072e988d
Merge branch 'master' of git.ucc.asn.au:/ipdf/code

Conflicts:
src/screen.cpp

David's way is better.
src/main.h
src/screen.cpp

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