changelog
    
    
    - Mon, 20 Jan 2014 23:44:32 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 20 Jan 2014 23:44:32 +0200] rev 670
 
    - - Merge ../ldforge into gl
 
    - Mon, 20 Jan 2014 23:43:47 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 20 Jan 2014 23:43:47 +0200] rev 669
 
    - - Merge ../ldforge into gl
 
    - Mon, 20 Jan 2014 16:42:18 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 20 Jan 2014 16:42:18 +0200] rev 668
 
    - - now compiles again
 
    - Mon, 20 Jan 2014 15:04:26 +0200
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 20 Jan 2014 15:04:26 +0200] rev 667
 
    - - Merge commit '5c835eb' into HEAD
Conflicts:
	src/file.cpp
	src/gldraw.cc
	src/gldraw.h 
    - Wed, 23 Oct 2013 13:14:17 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Wed, 23 Oct 2013 13:14:17 +0300] rev 666
 
    - now compiles again
 
    - Wed, 23 Oct 2013 12:46:10 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Wed, 23 Oct 2013 12:46:10 +0300] rev 665
 
    - Merge branch 'master' into gl
Conflicts:
	src/file.cpp
	src/gldraw.cpp
	src/gldraw.h
	src/gui.cpp
	src/ldtypes.cpp
	src/src.pro
	src/types.h 
    - Wed, 25 Sep 2013 11:02:44 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Wed, 25 Sep 2013 11:02:44 +0300] rev 664
 
    - Merge branch 'master' into gl
 
    - Tue, 22 Apr 2014 22:40:34 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 22 Apr 2014 22:40:34 +0300] rev 663
 
    - - moved the uncolorize action to the color toolbar, renamed to uncolor
 
    - Mon, 14 Apr 2014 16:00:36 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 14 Apr 2014 16:00:36 +0300] rev 662
 
    - - use the keyword 'not' in place of the exclamation mark for operator!, this is clearer. also converted uses of '== false' to this.
 
    - Thu, 10 Apr 2014 13:58:06 +0300
 
    - by Santeri Piippo <crimsondusk64@gmail.com> [Thu, 10 Apr 2014 13:58:06 +0300] rev 661
 
    - - renamed some cmake identifiers