Mercurial > ldforge / changelog

- Merge ../ldforge into gl

• 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

- 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

- now compiles again

• 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

- 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