merge

.hgtags

BuildParams

autobuild.xml

indra/llcommon/CMakeLists.txt

indra/llcommon/llaccountingquota.h

indra/llcommon/llchat.h

indra/llcommon/llversionviewer.h

indra/llinventory/llparcel.cpp

indra/llinventory/llparcel.h

indra/llprimitive/llmodel.cpp

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llrender.cpp

indra/llrender/llrendertarget.cpp

indra/llvfs/lldir_mac.cpp

indra/llvfs/lldir_mac.h

indra/llwindow/llkeyboardheadless.cpp

indra/lscript/lscript_library/lscript_library.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml