moving the NB freeform project into make folder not to interfere with…

… gradle
btraceio · Oct 31, 2015 · efc996e · efc996e
1 parent c627a2b
commit efc996e
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,7 @@ hs_err_pid*
 build
 dist
 docs
-nbproject/private
+make/netbeans/nbproject/private
 TEST-*
 make/junit*
 make/private.properties
@@ -26,4 +26,4 @@ junit*
 *.iml
 .gradle
 .idea
-!/lib/btrace-jctools-core-1.1.jar
+!/lib/btrace-jctools-core-1.1.jar
diff --git a/nbproject/genfiles.properties → make/netbeans/nbproject/genfiles.properties b/nbproject/genfiles.properties → make/netbeans/nbproject/genfiles.properties
diff --git a/nbproject/ide-file-targets.xml → make/netbeans/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml → make/netbeans/nbproject/ide-file-targets.xml
diff --git a/nbproject/jdk.xml → make/netbeans/nbproject/jdk.xml b/nbproject/jdk.xml → make/netbeans/nbproject/jdk.xml
diff --git a/nbproject/license-oracle_gpl2ce.txt → ...beans/nbproject/license-oracle_gpl2ce.txt b/nbproject/license-oracle_gpl2ce.txt → ...beans/nbproject/license-oracle_gpl2ce.txt
diff --git a/nbproject/nbjdk.properties → make/netbeans/nbproject/nbjdk.properties b/nbproject/nbjdk.properties → make/netbeans/nbproject/nbjdk.properties
diff --git a/nbproject/nbjdk.xml → make/netbeans/nbproject/nbjdk.xml b/nbproject/nbjdk.xml → make/netbeans/nbproject/nbjdk.xml
diff --git a/nbproject/private-project-properties.txt → .../nbproject/private-project-properties.txt b/nbproject/private-project-properties.txt → .../nbproject/private-project-properties.txt
diff --git a/nbproject/project.xml → make/netbeans/nbproject/project.xml b/nbproject/project.xml → make/netbeans/nbproject/project.xml