Mineplex2018-withcommit/Plugins/Nautilus.Game.Arcade/.settings
Morten 2ef32a14df Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
2015-11-10 17:15:23 +01:00
..
org.eclipse.core.resources.prefs Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
org.eclipse.jdt.core.prefs Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-10 17:15:23 +01:00
org.eclipse.jdt.ui.prefs Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-10 17:15:23 +01:00