1
0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
GLideN64/projects
Sergey Lipskiy cebf20bf4a Merge remote-tracking branch 'remotes/origin/master' into refactor_graphics
Conflicts:
	projects/msvc12/GLideN64.vcxproj
	projects/msvc12/GLideN64.vcxproj.filters
	src/BufferCopy/ColorBufferToRDRAM.cpp
	src/CMakeLists.txt
	src/GLideNUI/ConfigDialog.cpp
	src/GLideNUI/configDialog.ui
	src/mupen64plus-video-gliden64.mk
2017-02-21 12:51:00 +07:00
..
cmake Correct Readme for cmake projects 2017-01-28 10:11:54 +07:00
msvc12 Merge remote-tracking branch 'remotes/origin/master' into refactor_graphics 2017-02-21 12:51:00 +07:00