projects / platform / core / csapi / opentk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06a5169 afe2b3b)
Merge pull request #1 from TizenAPI/tizen
authorAndyLee <an87.li@samsung.com>
Mon, 10 Sep 2018 02:58:45 +0000 (10:58 +0800)
committerGitHub <noreply@github.com>
Mon, 10 Sep 2018 02:58:45 +0000 (10:58 +0800)
Merge tizen branch from TizenAPI/opentk

1  2 
src/OpenTK/Graphics/ES11/Helper.cs patch | diff1 | diff2 | blob | history
src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs patch | diff1 | diff2 | blob | history

diff --cc src/OpenTK/Graphics/ES11/Helper.cs
index 42bf9437dd398459a3938599dcd51b029d834698,699d580d0a63b2fcc69123a16272f7f2d5d94906..699d580d0a63b2fcc69123a16272f7f2d5d94906
mode 100755,100644..100755
--- 1/src/OpenTK/Graphics/ES11/Helper.cs
--- 2/src/OpenTK/Graphics/ES11/Helper.cs
+++ b/src/OpenTK/Graphics/ES11/Helper.cs
diff --cc src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
index e32783610325afe6ad83417c568dc702d68f4e5e,45f15e92e5c963f46090a57e989800cdb853070f..5d18477e41336cded3507ed17433fd7937a06e19
mode 100755,100644..100755
--- 1/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
--- 2/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
+++ b/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
Domain: Dotnet / API;