Lirusaito 19367b517c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate ...

Conflicts:
	indra/llui/lluictrl.cpp - Silly mergestuffs
	indra/newview/llfloatermediabrowser.cpp - deleted
	indra/newview/llpanellogin.cpp - updated functions went poof

Compile Fixies:
	indra/newview/llfloaterwater.cpp - I missed a spot with notificationsutil, it seems.

2013-06-26 12:37:31 -04:00

..

en-us

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

2013-06-26 12:37:31 -04:00

es

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

2013-06-25 23:49:04 -04:00

fr

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

2013-06-25 23:49:04 -04:00

pt

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

2013-06-25 23:49:04 -04:00