Sat, 29 Mar 2014 05:38:03 +0200
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
31
becb3e89345b
Added RC file for the application icon introduced in d2d86021
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
1 | IDI_ICON1 ICON DISCARDABLE "icons/ldforge.ico" |