projects
/
platform
/
core
/
csapi
/
opentk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
87030c0
b31e0e8
)
Merge branch 'no-reflect' of https://github.com/opentk/opentk
author
Stefanos A
<stapostol@gmail.com>
Sun, 15 Dec 2013 17:30:47 +0000
(18:30 +0100)
committer
Stefanos A
<stapostol@gmail.com>
Sun, 15 Dec 2013 17:30:47 +0000
(18:30 +0100)
Conflicts:
OpenTK.sln
1
2
OpenTK.sln
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
OpenTK.sln
index
a4dfcd6
,
4764e11
..
073400c
---
1
/
OpenTK.sln
---
2
/
OpenTK.sln
+++ b/
OpenTK.sln
@@@
-1,6
-1,6
+1,5
@@@
-
- Microsoft Visual Studio Solution File, Format Version 12.00
- # Visual Studio 2013
-
+ Microsoft Visual Studio Solution File, Format Version 11.00
+ # Visual Studio 2012
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "Source\OpenTK\OpenTK.csproj", "{A37A7E14-0000-0000-0000-000000000000}"