Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 12:35:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/networking
History
ZappoMan 2c02178802 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
	assignment-client/src/AssignmentClient.h
	libraries/shared/src/NodeList.cpp
2014-04-18 14:28:54 -07:00
..
src Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-04-18 14:28:54 -07:00
CMakeLists.txt make sure gnutls define for ssize_t comes before gnutls include 2014-04-10 10:27:08 -07:00