Files
SingularityViewer/indra/llcommon
Aleric Inglewood 7f78870295 Merge remote-tracking branch 'siana/master' into curlthreading2
Conflicts:
	indra/llcommon/llstring.cpp
	indra/llmessage/llcurl.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/viewer_manifest.py
	install.xml

Resolved:
	indra/llcommon/llstring.cpp :
		two different ways to work around compile error.
	indra/llmessage/llcurl.cpp :
		this file is no longer used.. I deleted huge
		parts to mark that I implemented that. Siana
		apparently made a few changes in those parts.
	indra/newview/llviewertexturelist.cpp :
		manually copied patch. Mine also removed trailing
		spaces, keeping that.
	indra/newview/viewer_manifest.py:
		Collision with changes from Liru, which have been
		ignored (kept siana/master).
	install.xml:
		Collision with an earlier screw up. I kept the
		fix from siana/master.
2012-07-18 02:08:31 +02:00
..
2012-02-10 01:37:43 +01:00
2012-02-10 01:37:43 +01:00
2012-07-03 00:54:25 -04:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2012-01-09 16:14:33 -05:00
2011-05-08 17:08:48 +02:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2012-01-29 01:33:14 -06:00
2012-03-06 17:04:05 +01:00
2011-10-13 00:03:56 -05:00
2010-04-02 02:48:44 -03:00
2011-07-15 00:21:38 -05:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2011-07-14 01:35:15 -05:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2011-03-15 02:33:55 -05:00
2010-04-02 02:48:44 -03:00
2011-06-07 21:35:10 -05:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2012-02-23 18:50:28 +01:00
2012-02-23 18:50:28 +01:00
2010-04-02 02:48:44 -03:00
2012-02-05 05:35:01 +01:00
2012-01-23 18:30:54 -06:00
2012-04-29 00:25:40 -04:00
2010-04-02 02:48:44 -03:00
2012-01-22 02:49:06 +01:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2011-05-08 17:08:48 +02:00
2011-11-23 23:40:31 -06:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2012-01-29 01:33:14 -06:00
2012-01-29 01:33:14 -06:00
2010-04-02 02:48:44 -03:00
2012-01-29 01:33:14 -06:00
2012-01-29 01:33:14 -06:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2012-04-29 00:25:40 -04:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2012-01-23 18:30:54 -06:00
2012-01-23 18:30:54 -06:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2012-02-01 03:27:04 +01:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2012-07-07 18:29:55 +02:00
2012-03-06 09:01:01 +01:00
2012-02-05 05:35:01 +01:00
2012-02-05 05:35:01 +01:00
2011-03-15 02:33:55 -05:00
2010-04-02 02:48:44 -03:00
2012-07-16 12:19:22 +02:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2011-02-22 18:24:17 -06:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2011-09-20 22:16:00 -05:00
2011-10-13 00:03:56 -05:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2011-07-13 04:35:38 -05:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00
2010-04-02 02:48:44 -03:00