summaryrefslogtreecommitdiffstats
path: root/EssentialsXMPP/nbproject
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-11-24 04:26:05 +0100
committersnowleo <schneeleo@gmail.com>2011-11-24 04:26:05 +0100
commit579bbc9f2cd003fc92dce1e38dc3a02c86cfbd7b (patch)
tree2f26d299df3316411bf3588d2de6d84f46f52225 /EssentialsXMPP/nbproject
parente672de949c6e4d0dcba6869a3e0669f0d9688297 (diff)
parentaf456a73dd575d8ecb994e153c06c0f6ec1fdf5a (diff)
downloadEssentials-579bbc9f2cd003fc92dce1e38dc3a02c86cfbd7b.tar
Essentials-579bbc9f2cd003fc92dce1e38dc3a02c86cfbd7b.tar.gz
Essentials-579bbc9f2cd003fc92dce1e38dc3a02c86cfbd7b.tar.lz
Essentials-579bbc9f2cd003fc92dce1e38dc3a02c86cfbd7b.tar.xz
Essentials-579bbc9f2cd003fc92dce1e38dc3a02c86cfbd7b.zip
Merge branch 'refs/heads/master' into release
Diffstat (limited to 'EssentialsXMPP/nbproject')
-rw-r--r--EssentialsXMPP/nbproject/project.properties2
1 files changed, 2 insertions, 0 deletions
diff --git a/EssentialsXMPP/nbproject/project.properties b/EssentialsXMPP/nbproject/project.properties
index 2e89ab318..802c76227 100644
--- a/EssentialsXMPP/nbproject/project.properties
+++ b/EssentialsXMPP/nbproject/project.properties
@@ -28,6 +28,7 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blank
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=*
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
@@ -36,6 +37,7 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.place
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups=false
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4