changelog
- Sat, 29 Mar 2014 05:38:03 +0200
- by Santeri Piippo <crimsondusk64@gmail.com> [Sat, 29 Mar 2014 05:38:03 +0200] rev 706
- Merge ../ldforge into gl
Conflicts:
CMakeLists.txt
src/actions.cc
src/glRenderer.cc
src/glRenderer.h
src/ldDocument.cc
src/ldDocument.h
src/ldObject.cc
src/ldObject.h
src/main.cc