Merge branch 'master' of github.com:andykorth/opentk
authorRobert Rouhani <robert.rouhani@gmail.com>
Sat, 26 Jan 2013 21:29:23 +0000 (16:29 -0500)
committerRobert Rouhani <robert.rouhani@gmail.com>
Sat, 26 Jan 2013 21:29:23 +0000 (16:29 -0500)
commit920d68395479af2830ae6f2de2469463e1028367
tree8a90beca26afc103dfe86fb397767a308205adac
parent8a7f506529ace4e53b9312873a253dbd13accad8
parent2c3a639fa44172b0a3bc3e091cd24b68957f282a
Merge branch 'master' of github.com:andykorth/opentk

Conflicts:
Source/OpenTK/Math/Matrix3.cs
Source/OpenTK/Math/Matrix3d.cs
Source/OpenTK/Math/Matrix3.cs
Source/OpenTK/Math/Matrix3d.cs
Source/OpenTK/Math/Matrix4d.cs