projects / platform / core / csapi / opentk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de71367 c697eae)
Merge branch 'develop' into fscheck_testing
authorvaron <varon@users.noreply.github.com>
Wed, 31 May 2017 12:08:32 +0000 (14:08 +0200)
committervaron <varon@users.noreply.github.com>
Wed, 31 May 2017 12:08:32 +0000 (14:08 +0200)
Conflicts:
paket.lock

1  2 
paket.dependencies patch | diff1 | diff2 | blob | history

diff --cc paket.dependencies
Simple merge
Domain: Dotnet / API;