Merge branch 'master' of ssh://192.168.1.132:22/opt/git/autoStock

Conflicts:
	src/com/autoStock/backtest/watchmaker/WMBacktest.java
	src/com/autoStock/backtest/watchmaker/WMBacktestContainer.java

Author: Kevin

.classpath

@@ -47,6 +47,6 @@
 			<attribute name="javadoc_location" value="file:/C:/Users/Kevin/Downloads/rJava_0.9-5/rJava/javadoc/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/encog-java-core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/encog-core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -1,2 +1,3 @@
 *.class
 
+/.classpath

.project

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>autoStock</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>autoStock</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -1,2 +1,2 @@
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

bin/.gitignore

@@ -1 +1 @@
-/com/
+/com