changelog
    
    
    - Mon, 10 Mar 2014 01:16:00 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 10 Mar 2014 01:16:00 +0200] rev 696
 
    - - objects need to be compiled when added to the document
 
    - Mon, 10 Mar 2014 01:02:51 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 10 Mar 2014 01:02:51 +0200] rev 695
 
    - - ported over the selected color blend from master
 
    - Mon, 10 Mar 2014 00:53:39 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 10 Mar 2014 00:53:39 +0200] rev 694
 
    - - the GL compiler now supports multiple documents
 
    - Sun, 09 Mar 2014 21:14:07 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Sun, 09 Mar 2014 21:14:07 +0200] rev 693
 
    - - LDDocument must be initialized with m_needsGLReInit as true or it will not be compiled properly...
 
    - Sun, 09 Mar 2014 21:07:44 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Sun, 09 Mar 2014 21:07:44 +0200] rev 692
 
    - - fixed build errors
 
    - Sun, 09 Mar 2014 15:00:05 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Sun, 09 Mar 2014 15:00:05 +0200] rev 691
 
    - Merge ../ldforge into gl
 
    - Sun, 09 Mar 2014 14:59:46 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Sun, 09 Mar 2014 14:59:46 +0200] rev 690
 
    - Merge ../ldforge into gl
Conflicts:
	src/Document.cc
	src/Document.h
	src/GLRenderer.cc
	src/LDObject.cc
	src/LDObject.h
	src/Types.h
	src/actions/EditActions.cc