diff options
| author | Sven Gothel <[email protected]> | 2010-03-29 04:51:49 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-03-29 04:51:49 +0200 |
| commit | 69fe372b874d913e2d1c27f1d103e1fced668ecf (patch) | |
| tree | cf402337903ba3d02bbab628f2f82a23908a5f11 /nbproject | |
| parent | 2138fc787c1e497be7f373aa68b3f751c955008f (diff) | |
| parent | 2d76c16b9384d383d3e6a9d7cb727f2591a39228 (diff) | |
Resolved conflicts
Diffstat (limited to 'nbproject')
| -rwxr-xr-x | nbproject/project.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/nbproject/project.xml b/nbproject/project.xml index 84bdc44..054a6bc 100755 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -47,6 +47,12 @@ <location>build/test/gensrc/java</location> <encoding>UTF-8</encoding> </source-folder> + <source-folder> + <label>src/junit</label> + <type>java</type> + <location>src/junit</location> + <encoding>UTF-8</encoding> + </source-folder> </folders> <ide-actions> <action name="build"> @@ -172,6 +178,10 @@ <label>build/test/gensrc/java</label> <location>build/test/gensrc/java</location> </source-folder> + <source-folder style="packages"> + <label>src/junit</label> + <location>src/junit</location> + </source-folder> <source-file> <location>${ant.script}</location> </source-file> @@ -214,6 +224,12 @@ <unit-tests/> <source-level>1.5</source-level> </compilation-unit> + <compilation-unit> + <package-root>src/junit</package-root> + <unit-tests/> + <classpath mode="compile">build/classes:build/test/build/classes:lib/antlr-3.2.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}:make/lib/junit-4.5.jar</classpath> + <source-level>1.5</source-level> + </compilation-unit> </java-data> <preferences xmlns="http://www.netbeans.org/ns/auxiliary-configuration-preferences/1"> <module name="org-netbeans-modules-editor-indent"/> |