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-04-29 00:25:40 -04:00
2012-07-18 01:41:36 +02:00
2012-07-18 01:41:36 +02:00
2012-07-16 22:35:04 +02:00
2012-07-18 01:41:36 +02:00
2012-07-17 18:04:48 -05:00
2012-06-28 01:30:46 +02:00
2012-06-28 04:08:25 -04:00
2012-03-06 07:31:15 +01:00
2012-03-06 09:11:36 +01:00
2012-03-06 09:11:36 +01:00
2012-06-30 21:14:18 +02:00
2012-03-06 07:31:15 +01:00
2012-04-12 10:29:45 -05:00
2012-04-12 10:29:45 -05:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-12 00:35:47 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-07-02 19:45:41 +00:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-07-15 02:29:00 +02:00
2012-06-28 01:30:46 +02:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-12 00:35:47 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-07-15 02:29:00 +02:00
2012-06-28 01:30:46 +02:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-07-15 22:46:38 +02:00
2012-07-16 22:35:04 +02:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-06-28 04:08:25 -04:00
2012-06-28 04:08:25 -04:00
2012-07-16 22:35:04 +02:00
2012-07-15 22:46:38 +02:00
2012-03-06 07:31:15 +01:00
2012-02-18 02:22:49 +01:00
2012-03-06 07:31:15 +01:00
2012-04-28 21:29:52 -04:00
2012-04-28 21:29:52 -04:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-06-28 01:30:46 +02:00
2012-02-18 02:22:49 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-06-28 01:30:46 +02:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-07-16 22:35:04 +02:00
2012-07-15 22:46:38 +02:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-07-02 19:45:41 +00:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-04-28 21:29:52 -04:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00
2012-03-06 07:31:15 +01:00