Mercurial > ldforge / changelog

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

- minor stuff

• Sun, 09 Mar 2014 14:04:06 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Sun, 09 Mar 2014 14:04:06 +0200] rev 689
• - minor stuff

Merge ../ldforge into gl

• Mon, 24 Feb 2014 00:59:57 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 24 Feb 2014 00:59:57 +0200] rev 688
• Merge ../ldforge into gl
  
  Conflicts:
  src/Document.h

- axes are now drawn properly again

• Sun, 23 Feb 2014 20:13:32 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Sun, 23 Feb 2014 20:13:32 +0200] rev 687
• - axes are now drawn properly again

Merge ../ldforge into gl

• Sun, 23 Feb 2014 20:03:33 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Sun, 23 Feb 2014 20:03:33 +0200] rev 686
• Merge ../ldforge into gl

Merge ../ldforge into gl

• Sun, 23 Feb 2014 20:02:36 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Sun, 23 Feb 2014 20:02:36 +0200] rev 685
• Merge ../ldforge into gl