Mercurial > ldforge / changelog

- Merge commit '5c835eb' into HEAD

• 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

now compiles again

• 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

Merge branch 'master' into gl

• 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