diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
| commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
| tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /.gitignore | |
| parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
| parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
| download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip | |
Merge 0.4.16 into stable-0.4
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index d7e0daab4..7b5ecab67 100644 --- a/.gitignore +++ b/.gitignore @@ -22,9 +22,12 @@ tags !tags/ gtags.files .idea/* +# Codelite +*.project ## Files related to minetest development cycle /*.patch +*.diff # GNU Patch reject file *.rej @@ -43,11 +46,17 @@ gtags.files !/mods/minetest/mods_here.txt /worlds /world/ +/clientmods/* +!/clientmods/preview/ +/client/mod_storage/ ## Configuration/log files minetest.conf debug.txt +## Other files generated by minetest +screenshot_*.png + ## Doxygen files doc/Doxyfile doc/html/ @@ -74,16 +83,19 @@ locale/ *.a *.ninja .ninja* +*.gch +cmake-build-debug/ +cmake-build-release/ ## Android build files build/android/src/main/assets build/android/build build/android/deps build/android/libs +build/android/jni/lib build/android/jni/src build/android/src/main/jniLibs build/android/obj build/android/local.properties build/android/.gradle timestamp - |