merge

.hgtags

BuildParams

autobuild.xml

indra/llcommon/llapp.cpp

indra/llcommon/llapp.h

indra/llcommon/llfoldertype.cpp

indra/llui/llfolderview.cpp

indra/llui/llfolderview.h

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

...wview/app_settings/shaders/class1/avatar/avatarSkinV.glsl

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llappviewerwin32.cpp

indra/newview/llavataractions.cpp

indra/newview/llfloateroutbox.cpp

indra/newview/llfloateroutbox.h

indra/newview/llfolderviewmodelinventory.cpp

indra/newview/llinventorymodel.cpp

indra/newview/llinventorymodel.h