merge

.hgignore

indra/cmake/Copy3rdPartyLibs.cmake

indra/llcommon/llclickaction.h

indra/llcommon/llsys.cpp

indra/llcommon/llthread.cpp

indra/llcommon/llthread.h

indra/llmessage/llcachename.cpp

indra/llmessage/llcachename.h

indra/llui/llcheckboxctrl.h

indra/llui/llflatlistview.cpp

indra/llui/llflatlistview.h

indra/llui/llfloater.cpp

indra/llui/llresizebar.cpp

indra/llui/lltextbase.cpp

indra/llwindow/llwindowmacosx.cpp

indra/lscript/lscript_compile/indra.l

indra/newview/CMakeLists.txt

indra/newview/app_settings/keywords.ini

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp