phr0z3nt04st 70e296e174 Merge branch 'master' of github.com:HazimGazov/Inertia ...

Conflicts:
	indra/newview/llviewermenu.cpp

2010-06-09 00:59:47 -05:00

..

html

Imported existing code

2010-04-02 02:48:44 -03:00

textures

forgot some texture files ;D

2010-05-13 23:17:05 -05:00

xui

Merge branch 'master' of github.com:HazimGazov/Inertia

2010-06-09 00:59:47 -05:00

colors_base.xml

Imported existing code

2010-04-02 02:48:44 -03:00

colors.xml

Imported existing code

2010-04-02 02:48:44 -03:00