From 4b8acb96a70bc034b3201f003063ee83228fde96 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Thu, 26 Nov 2015 14:09:28 -0500 Subject: [PATCH] gitignore: cleanup Conflicts: .gitignore --- .gitignore | 121 +++++++---------------------------------------------- 1 file changed, 14 insertions(+), 107 deletions(-) diff --git a/.gitignore b/.gitignore index 49ca1902d..1fa8c29c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,20 @@ +**/nbproject/private/ /.gradle/ -/.nb-gradle/private/ -/.nb-gradle/profiles/private/ +/.nb-gradle/ /.idea/ /dist/ /build/ +/bin/ /netbeans/ -/sdk/jdks/local/ +/.classpath +/.project +/.settings +*.dll +*.so +*.jnilib +*.dylib +*.iml +.DS_Store /jme3-core/build/ /jme3-core/src/main/resources/com/jme3/system/version.properties /jme3-plugins/build/ @@ -22,6 +31,7 @@ /jme3-jogg/build/ /jme3-jbullet/build/ /jme3-lwjgl/build/ +/jme3-lwjgl3/build/ /jme3-networking/build/ /jme3-niftygui/build/ /jme3-testdata/build/ @@ -29,6 +39,7 @@ /jme3-jogl/build/ /jme3-ios/build/ /jme3-gl-autogen/build/ +/jme3-lwjgl3/build/ /jme3-bullet-native/bullet.zip /jme3-bullet-native/bullet-2.82-r2704/ /jme3-android-native/openal-soft/ @@ -38,113 +49,9 @@ /jme3-android-native/src/native/jme_decode/com_jme3_audio_plugins_NativeVorbisFile.h /jme3-android-native/src/native/jme_decode/com_jme3_texture_plugins_AndroidNativeImageLoader.h /jme3-android-native/stb_image.h -/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsProject.zip -/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JME3TestsAndroidProject.zip -/sdk/jme3-project-testdata/release/ -/sdk/JME3TestsTemplateAndroid/src/jme3test/ -/sdk/JME3TestsTemplate/src/jme3test/ -/sdk/build/ -/sdk/jme3-core-baselibs/release/ -/sdk/jme3-core-libraries/release/ -/sdk/jme3-project-baselibs/release/ -/sdk/jme3-project-libraries/release/ -/sdk/jme3-codepalette/build/ -/sdk/jme3-core-libraries/build/ -/sdk/jme3-code-check/build/ -/sdk/jme3-core-baselibs/build/ -/sdk/jme3-documentation/build/ -/sdk/jme3-core-updatecenters/build/ -/sdk/jme3-project-testdata/build/ -/sdk/jme3-project-libraries/build/ -/sdk/jme3-project-baselibs/build/ -/sdk/jme3-templates/build/ -/sdk/jme3-texture-editor/build/ -/sdk/jme3-tests-template/build/ -/sdk/jme3-upgrader/build/ -/sdk/jme3-core/build/ -/sdk/jme3-obfuscate/build/ -/sdk/jme3-gui/build/ -/sdk/jme3-cinematics/build/ -/sdk/jme3-terrain-editor/build/ -/sdk/jme3-lwjgl-applet/build/ -/sdk/jme3-blender/build/ -/sdk/jme3-navmesh-gen/build/ -/sdk/jme3-angelfont/build/ -/sdk/jme3-materialeditor/build/ -/sdk/jme3-android/build/ -/sdk/jme3-desktop-executables/build/ -/sdk/jme3-ogrexml/build/ -/sdk/jme3-ogretools/build/ -/sdk/jme3-scenecomposer/build/ -/sdk/jme3-assetpack-support/build/ -/sdk/jme3-model-importer/build/ -/sdk/jme3-wavefront/build/ -/sdk/jme3-vehicle-creator/build/ -/sdk/jme3-welcome-screen/build/ -/sdk/jme3-glsl-support/build/ -/sdk/jme3-dark-laf/build/ -/sdk/nbproject/private/ -/sdk/jme3-scenecomposer/nbproject/private/ -/sdk/jme3-core/nbproject/private/ -/sdk/jme3-core-baselibs/nbproject/private/ -/sdk/jme3-welcome-screen/nbproject/private/ -/sdk/jme3-lwjgl-applet/nbproject/private/ -/sdk/jme3-ogrexml/nbproject/private/ -/sdk/jme3-upgrader/nbproject/private/ -/sdk/jme3-obfuscate/nbproject/private/ -/sdk/jme3-navmesh-gen/nbproject/private/ -/sdk/jme3-wavefront/nbproject/private/ -/sdk/jme3-project-libraries/nbproject/private/ -/sdk/jme3-ogretools/nbproject/private/ -/sdk/jme3-assetpack-support/nbproject/private/ -/sdk/jme3-cinematics/nbproject/private/ -/sdk/jme3-model-importer/nbproject/private/ -/sdk/jme3-desktop-executables/nbproject/private/ -/sdk/jme3-glsl-support/nbproject/private/ -/sdk/jme3-android/nbproject/private/ -/sdk/jme3-angelfont/nbproject/private/ -/sdk/jme3-codepalette/nbproject/private/ -/sdk/jme3-documentation/nbproject/private/ -/sdk/jme3-vehicle-creator/nbproject/private/ -/sdk/jme3-code-check/nbproject/private/ -/sdk/jme3-blender/nbproject/private/ -/sdk/jme3-core-libraries/nbproject/private/ -/sdk/jme3-core-updatecenters/nbproject/private/ -/sdk/jme3-gui/nbproject/private/ -/sdk/jme3-materialeditor/nbproject/private/ -/sdk/jme3-project-baselibs/nbproject/private/ -/sdk/jme3-project-testdata/nbproject/private/ -/sdk/jme3-templates/nbproject/private/ -/sdk/jme3-terrain-editor/nbproject/private/ -/sdk/jme3-tests-template/nbproject/private/ -/sdk/jme3-texture-editor/nbproject/private/ -/sdk/JME3TestsTemplate/nbproject/private/ -/sdk/JME3TestsTemplateAndroid/nbproject/private/ -/bin -/.classpath -/.project -/.settings -*.dll -*.so -*.jnilib -*.dylib -*.iml -.DS_Store -/sdk/dist/ !/jme3-bullet-native/libs/native/windows/x86_64/bulletjme.dll !/jme3-bullet-native/libs/native/windows/x86/bulletjme.dll !/jme3-bullet-native/libs/native/osx/x86/libbulletjme.dylib !/jme3-bullet-native/libs/native/osx/x86_64/libbulletjme.dylib !/jme3-bullet-native/libs/native/linux/x86/libbulletjme.so !/jme3-bullet-native/libs/native/linux/x86_64/libbulletjme.so -/.nb-gradle/ -/sdk/ant-jme/nbproject/private/ -/sdk/nbi/stub/ext/engine/nbproject/private/ -/sdk/nbi/stub/ext/components/products/jdk/nbproject/private/ -/sdk/nbi/stub/ext/components/products/blender/nbproject/private/ -/sdk/nbi/stub/ext/components/products/helloworld/nbproject/private/ -/sdk/BasicGameTemplate/nbproject/private/ -/sdk/nbi/stub/ext/components/products/jdk/build/ -/sdk/nbi/stub/ext/components/products/jdk/dist/ -/sdk/jme3-dark-laf/nbproject/private/ -jme3-lwjgl3/build/