Commit Graph

52 Commits

Author SHA1 Message Date
Camilla Berglund
da02844457 Merge branch 'master' into EGL
Conflicts:
	readme.html
	src/win32_platform.h
	src/x11_platform.h
2012-12-02 16:17:59 +01:00
Camilla Berglund
1eef0f0869 Renamed context module files. 2012-11-27 15:21:49 +01:00