Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,974 Commits 20 Branches 51 Tags
536cb6febd81e369f689bfe8a578f39cc0c0d175
Commit Graph

3 Commits

Author SHA1 Message Date
Aleric Inglewood
536cb6febd Merge branch 'curlthreading2' into curlthreading3 
Conflicts:
	indra/CMakeLists.txt
	indra/llcommon/llstring.h
	indra/llmessage/CMakeLists.txt
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp
 2012-08-15 00:51:40 +02:00
Aleric Inglewood
cdefc0e384 Merge branch 'curlthreading2' into curlthreading3 
Conflicts:
	indra/llmessage/llcurlrequest.cpp

Header file include changes collided. Fixed.
 2012-07-31 17:46:07 +02:00
Aleric Inglewood
cd93aba002 Created aistatemachine library and moved files. 2012-07-29 01:30:10 +02:00