Mercurial > ldforge / changelog

Merge ../ldforge into gl

• Sun, 06 Apr 2014 01:40:04 +0300
• by Santeri Piippo <crimsondusk64@gmail.com> [Sun, 06 Apr 2014 01:40:04 +0300] rev 707
• Merge ../ldforge into gl

Merge ../ldforge into gl

• 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

Merge ../ldforge into gl

• Wed, 12 Mar 2014 16:21:49 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Wed, 12 Mar 2014 16:21:49 +0200] rev 705
• Merge ../ldforge into gl