Allanis d054492693 Eash. Merging branch testing.. ...

Conflicts:
	utils/resedit/faction.pyc
	utils/resedit/factions.glade
	utils/resedit/planets.glade
	utils/resedit/space.glade
	utils/resedit/space.py
	utils/resedit/space.pyc

2013-06-16 17:17:54 +01:00

21 KiB

Raw History

View Raw