afinetapestry/glengine — pull request #2 by josh04 (2013-06-01 19:34:40+00:00)
Title: merge conflicts

compiles for me