Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-Armored-Dragon/libraries/shared
History
Brad Davis 5744200f64 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
..
src Merge remote-tracking branch 'upstream/master' into plugins 2015-07-20 19:21:02 -07:00
CMakeLists.txt another attempt 2015-06-18 09:43:39 -07:00