changelog
    
    
    - Tue, 08 Apr 2014 11:12:08 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 08 Apr 2014 11:12:08 +0300] rev 712
 
    - Merge ../ldforge into gl
 
    - Tue, 08 Apr 2014 11:07:47 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 08 Apr 2014 11:07:47 +0300] rev 711
 
    - Merge ../ldforge into gl
 
    - Tue, 08 Apr 2014 11:04:35 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 08 Apr 2014 11:04:35 +0300] rev 710
 
    - Merge ../ldforge into gl
 
    - Tue, 08 Apr 2014 11:00:29 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 08 Apr 2014 11:00:29 +0300] rev 709
 
    - - added safety check to the countof macro
 
    - Tue, 08 Apr 2014 10:54:32 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 08 Apr 2014 10:54:32 +0300] rev 708
 
    - - more debugging...
 
    - 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
 
    - 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 
    - 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