projectswg-bitbucket/cucore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/cucore.git synced 2026-10-08 00:13:00 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into awareness

Browse Source 
Conflicts:
	src/services/objects/ObjectManager.java
This commit is contained in:
Waverunner
2014-12-15 08:57:01 -05:00
parent fe9bd9f89d f98b183958
commit 2b37cbb7bb
5 changed files with 85 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/CoreManager.java
+1 -1
View File
@@ -18,7 +18,7 @@ import services.galaxy.GalacticManager;
public class CoreManager extends Manager {
private static final int galaxyId = 2;
private static final int galaxyId = 1;
private EngineManager engineManager;
private GalacticManager galacticManager;