Lirusaito 5fc712104a Merge branch 'master' of https://bitbucket.org/SingularityViewer/singularityviewer into Frosting ...

Conflicts:
	indra/newview/linux_tools/wrapper.sh

2013-05-12 03:33:34 -04:00

..

client-readme-joystick.txt

…

client-readme-voice.txt

…

client-readme.txt

…

handle_secondlifeprotocol.sh

…

install.sh

…

launch_url.sh

…

refresh_desktop_app_entry.sh

…

register_secondlifeprotocol.sh

…

wrapper.sh

Merge branch 'master' of https://bitbucket.org/SingularityViewer/singularityviewer into Frosting

2013-05-12 03:33:34 -04:00