premake4.lua · cef3 · Lisa Greene / Tales of MajEyal · GitLab

Mar 18, 2014
0295c72d
Merge branch 'master' into cef3 · 0295c72d
DarkGod authored Mar 18, 2014
```
Conflicts:
	build/options.lua
	premake4.lua
```
0295c72d
Merge branch 'master' into cef3
DarkGod authored Mar 18, 2014
```
Conflicts:
	build/options.lua
	premake4.lua
```