Commit Graph

2 Commits

Author SHA1 Message Date
Siana Gearz
de74443d76 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/llvovolume.cpp
	indra/newview/skins/default/xui/fr/panel_overlaybar.xml
2012-08-09 00:42:23 +02:00
Shyotl
58033d3cbc Added rebake navmesh button. Brought in rest of the underlying navmesh implementation. 2012-08-06 10:11:12 -05:00