Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex

Conflicts:
	Plugins/Mineplex.Database/.classpath
This commit is contained in:
Chiss 2014-09-12 11:49:18 +10:00
commit b507571403

View File

@ -2,11 +2,8 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="Z:/Mineplex/master/Plugins/Libraries/jooq-3.4.2.jar"/>
<classpathentry kind="lib" path="Z:/Mineplex/master/Plugins/Libraries/jooq-3.4.2-javadoc.jar"/>
<classpathentry kind="lib" path="Z:/Mineplex/master/Plugins/Libraries/jooq-3.4.2-sources.jar"/>
<classpathentry kind="lib" path="Z:/Mineplex/master/Plugins/Libraries/jooq-codegen-3.4.2.jar"/>
<classpathentry kind="lib" path="Z:/Mineplex/master/Plugins/Libraries/jooq-meta-3.4.2.jar"/>
<classpathentry kind="lib" path="Z:/Mineplex/master/Plugins/Libraries/jopt-simple-3.2.jar"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-3.4.2.jar"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-meta-3.4.2.jar"/>
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-codegen-3.4.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>