merge

.hgtags

indra/llcommon/llversionviewer.h

indra/llmessage/lldatapacker.h

indra/newview/groupchatlistener.cpp

indra/newview/groupchatlistener.h

indra/newview/lldrawpoolbump.cpp

indra/newview/llfloaterbuyland.cpp

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfloatermodelpreview.h

indra/newview/llviewermessage.cpp

indra/newview/llviewerparcelmgr.cpp

indra/newview/llviewerprecompiledheaders.h

indra/newview/llviewertexturelist.cpp

indra/newview/llvocache.cpp

indra/newview/skins/default/xui/de/floater_postcard.xml

...ewview/skins/default/xui/de/panel_preferences_privacy.xml

indra/newview/skins/default/xui/en/floater_buy_currency.xml

...a/newview/skins/default/xui/en/panel_preferences_chat.xml

...newview/skins/default/xui/en/panel_preferences_colors.xml

...view/skins/default/xui/en/panel_preferences_graphics1.xml