Files
SingularityViewer/indra/llmessage
Aleric Inglewood fbb5dced97 Merge remote-tracking branch 'singu/master' into curlthreading2
Conflicts:
	indra/llcommon/CMakeLists.txt
	indra/llmessage/llcurl.cpp
	indra/llmessage/llcurl.h
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llpumpio.cpp
	indra/llmessage/llpumpio.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp
	indra/newview/llspatialpartition.cpp
	indra/newview/llviewermedia.cpp
	indra/newview/llxmlrpctransaction.cpp

Conflicts resolved by choosing curlthreading2
for any llmessage file regardless (which looks
correct upon investigation); the rest also
turned out to need to use curlthreading2, except
in one line where I added a semi-colon after
an assert(), and the assert was changed in
singu/master.
2012-08-13 17:07:25 +02:00
..
2012-04-29 00:25:40 -04:00
2012-08-12 17:42:30 +02:00
2012-08-12 17:10:44 +02:00
2012-03-06 07:31:15 +01:00
2012-08-09 10:56:29 -04:00
2012-03-06 07:31:15 +01:00
2012-07-16 22:35:04 +02:00
2012-03-06 07:31:15 +01:00
2012-07-20 08:13:07 -04:00
2012-03-06 07:31:15 +01:00