Siana Gearz
|
9ac2c07f52
|
Merge https://github.com/PlayerDagostino/SingularityViewer into future
Conflicts:
indra/llplugin/llplugininstance.cpp
indra/llwindow/llwindowsdl.cpp
indra/llwindow/llwindowsdl.h
indra/newview/llpreviewnotecard.cpp
indra/newview/llviewerwindow.h
|
2011-10-03 16:10:35 +02:00 |
|