Go to file
Erica 9c0d3e4e86 resolving sidepanel conflict
--HG--
branch : avatar-pipeline
2009-12-11 13:17:19 -08:00
doc Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-04 09:54:07 -05:00
etc
indra resolving sidepanel conflict 2009-12-11 13:17:19 -08:00
scripts Adding new option definition - forgot. 2009-11-06 15:54:11 -08:00
.hgignore merge, manual conflict fix panel_bottomtray.xml, talk_button.xml, llfloaternearbymedia.cpp 2009-11-23 14:46:47 -08:00
install.xml Update vivox sdk to 3.0.0006.7714 2009-12-08 12:29:44 -08:00