Aleric Inglewood
|
1254a7bbe2
|
Merge remote-tracking branch 'github/master' into curlthreading3
Conflicts:
indra/aistatemachine/aistatemachine.cpp
|
2012-09-22 01:25:54 +02:00 |
|
Aleric Inglewood
|
a032bd28ad
|
Merge branch 'curlthreading2' into curlthreading3
|
2012-09-11 17:05:13 +02:00 |
|
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
|
f479ea4bcf
|
Merge branch 'curlthreading2' into curlthreading3
|
2012-08-06 19:55:19 +02:00 |
|
Aleric Inglewood
|
af4ac8fb5f
|
WIP: work on rewriting LLURLRequest
|
2012-07-29 01:30:11 +02:00 |
|
Aleric Inglewood
|
516f5a40d0
|
Change mainloop to no longer use gIdleCallbacks
|
2012-07-29 01:30:11 +02:00 |
|
Aleric Inglewood
|
cd93aba002
|
Created aistatemachine library and moved files.
|
2012-07-29 01:30:10 +02:00 |
|