git@UCC - ipdf/code.git/commit

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

author	Sam Moore <[email protected]>
	Thu, 23 Oct 2014 11:49:35 +0000 (19:49 +0800)
committer	Sam Moore <[email protected]>
	Thu, 23 Oct 2014 11:49:35 +0000 (19:49 +0800)
commit	f0b6c9b6b95fde134927c395afbfbbbc057868e6
tree	c54c8918c02747ac37ba5e0a1b9faa4b83cdd3d1	tree \| snapshot
parent	6c0dfe752994312ee58d307b383948bfeb2d6e2e	commit \| diff
parent	d68c91a7a2a3a4b3a312a50cbab5a7539d4cd7d5	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
src/bezier.cpp	diff1 \|	diff2 \|	blob \| history
src/bezier.h	diff1 \|	diff2 \|	blob \| history
src/debugscript.cpp	diff1 \|	diff2 \|	blob \| history
src/debugscript.h	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history
src/main.h	diff1 \|	diff2 \|	blob \| history
src/screen.cpp	diff1 \|	diff2 \|	blob \| history
src/turtles_all_the_way_down.script	diff1 \|	diff2 \|	blob \| history
src/view.cpp	diff1 \|	diff2 \|	blob \| history
src/view.h	diff1 \|	diff2 \|	blob \| history

Infinite Precision Document Formats - Code base

RSS Atom

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

src/Makefile	diff1 \|	diff2 \|	blob \| history
src/bezier.cpp	diff1 \|	diff2 \|	blob \| history
src/bezier.h	diff1 \|	diff2 \|	blob \| history
src/debugscript.cpp	diff1 \|	diff2 \|	blob \| history
src/debugscript.h	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history
src/main.h	diff1 \|	diff2 \|	blob \| history
src/screen.cpp	diff1 \|	diff2 \|	blob \| history
src/turtles_all_the_way_down.script	diff1 \|	diff2 \|	blob \| history
src/view.cpp	diff1 \|	diff2 \|	blob \| history
src/view.h	diff1 \|	diff2 \|	blob \| history