Skip to content

Commit 07d737d

Browse files
atduskgregatduskgreg
committed
merge poulp changes applying libs re-org and windows path fix
2 parents e6aea0c + 5cdf1de commit 07d737d

88 files changed

Lines changed: 84 additions & 18 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<classpath>
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
5-
<classpathentry kind="lib" path="/Users/greg/Documents/code/eclipse/libs/core.jar"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/opencv-2.4.4"/>
5+
<classpathentry kind="lib" path="/Users/p0/Documents/Eclipse/processing-libraries/core.jar"/>
6+
<classpathentry kind="lib" path="/Users/p0/Documents/Eclipse/opencv-processing/lib/opencv-245.jar"/>
77
<classpathentry kind="output" path="bin"/>
88
</classpath>

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ distribution/*
1717
*.launch
1818

1919
.DS_Store
20-
*.DS_Store
20+
*.DS_Store
21+
/bin

data/haarcascade_clock.xml renamed to lib/cascade-files/haarcascade_clock.xml

File renamed without changes.

data/haarcascade_eye.xml renamed to lib/cascade-files/haarcascade_eye.xml

File renamed without changes.

data/haarcascade_eye_tree_eyeglasses.xml renamed to lib/cascade-files/haarcascade_eye_tree_eyeglasses.xml

File renamed without changes.

data/haarcascade_frontalface_alt.xml renamed to lib/cascade-files/haarcascade_frontalface_alt.xml

File renamed without changes.

data/haarcascade_frontalface_alt2.xml renamed to lib/cascade-files/haarcascade_frontalface_alt2.xml

File renamed without changes.

data/haarcascade_frontalface_alt_tree.xml renamed to lib/cascade-files/haarcascade_frontalface_alt_tree.xml

File renamed without changes.

data/haarcascade_frontalface_default.xml renamed to lib/cascade-files/haarcascade_frontalface_default.xml

File renamed without changes.

data/haarcascade_fullbody.xml renamed to lib/cascade-files/haarcascade_fullbody.xml

File renamed without changes.

0 commit comments

Comments
 (0)