projects
/
platform
/
core
/
csapi
/
opentk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7c98a9c
4bde589
)
Merge pull request #157 from thefiddler/warnfix
author
thefiddler
<stapostol@gmail.com>
Mon, 21 Jul 2014 16:05:20 +0000
(18:05 +0200)
committer
thefiddler
<stapostol@gmail.com>
Mon, 21 Jul 2014 16:05:20 +0000
(18:05 +0200)
Fix all build warnings on VS2013 and Mono 3.4.0
1
2
Source/OpenTK/Graphics/ES11/ES11.cs
patch
|
diff1
|
diff2
|
blob
|
history
Source/OpenTK/Graphics/ES11/ES11Enums.cs
patch
|
diff1
|
diff2
|
blob
|
history
Source/OpenTK/Graphics/OpenGL/GL.cs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Source/OpenTK/Graphics/ES11/ES11.cs
Simple merge
diff --cc
Source/OpenTK/Graphics/ES11/ES11Enums.cs
index
89398de
,
dc6ce9c
..
bc5b5a9
---
1
/
Source/OpenTK/Graphics/ES11/ES11Enums.cs
---
2
/
Source/OpenTK/Graphics/ES11/ES11Enums.cs
+++ b/
Source/OpenTK/Graphics/ES11/ES11Enums.cs
@@@
-12246,12
-12284,9
+12284,13
@@@
namespace OpenTK.Graphics.ES1
/// <summary>
/// Not used directly.
/// </summary>
+ [CLSCompliant(false)]
public enum OesByteCoordinates : int
{
+ /// <summary>
+ /// Original was GL_BYTE = 0x1400
+ /// </summary>
+ Byte = ((int)0x1400) ,
}
/// <summary>
diff --cc
Source/OpenTK/Graphics/OpenGL/GL.cs
Simple merge