overte-HifiExperiments/libraries/shared
Andrew Meadows 1266ffd0ca merge of windows-build
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
2014-01-16 09:00:13 -08:00
..
external move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
src merge of windows-build 2014-01-16 09:00:13 -08:00
CMakeLists.txt remove the starfield URL loading code, closes #1497 2014-01-10 15:33:43 -08:00