Merge branch 'master' of git.ucc.asn.au:ipdf/code
authorDavid Gow <david@ingeniumdigital.com>
Mon, 21 Apr 2014 04:35:36 +0000 (12:35 +0800)
committerDavid Gow <david@ingeniumdigital.com>
Mon, 21 Apr 2014 04:35:36 +0000 (12:35 +0800)
commitaaa65d90ac812f924cbbc39bef7a5f8b6cad2da3
tree6cdaa657236c4457b0f5d9740c55a99f5dc280e0
parent6ad7439e8ebf969fcd2d3a710a4b16e2b1ee131f
parente164c93218ed4599614f4f6e5e815429a3fedbf7
Merge branch 'master' of git.ucc.asn.au:ipdf/code

Conflicts:
src/Makefile
src/main.h
src/real.h
src/screen.cpp
src/view.h

This was one hell of a merge. I have more code coming, but
it breaks other things, so it'll take a little while.
bin/ipdf
src/Makefile
src/main.h
src/real.h
src/screen.cpp
src/view.cpp
src/view.h

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