overte/domain-server
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
..
resources/web temp remove audio from agent, fix GOL placeholder 2013-11-07 12:07:34 -08:00
src merge of windows-build 2014-01-16 09:00:13 -08:00
CMakeLists.txt fix link issues for many targets 2014-01-13 01:01:30 -08:00