Merge branch terrible and branch awful
authorSam Moore <matches@ucc.asn.au>
Thu, 23 Oct 2014 11:49:35 +0000 (19:49 +0800)
committerSam Moore <matches@ucc.asn.au>
Thu, 23 Oct 2014 11:49:35 +0000 (19:49 +0800)
commitf0b6c9b6b95fde134927c395afbfbbbc057868e6
treec54c8918c02747ac37ba5e0a1b9faa4b83cdd3d1
parent6c0dfe752994312ee58d307b383948bfeb2d6e2e
parentd68c91a7a2a3a4b3a312a50cbab5a7539d4cd7d5
Merge branch terrible and branch awful

scr.Present was in wrong place
Merging sucks
Everything sucks
GPUs suck
fglrx sucks
professionalism sucks
I hope no one looking to hire me ever reads these.

Conflicts:
src/main.h
src/Makefile
src/bezier.cpp
src/bezier.h
src/debugscript.cpp
src/debugscript.h
src/main.cpp
src/main.h
src/screen.cpp
src/turtles_all_the_way_down.script
src/view.cpp
src/view.h

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