diff options
author | Weblate <42@minetest.ru> | 2013-02-28 18:03:28 +0100 |
---|---|---|
committer | Weblate <42@minetest.ru> | 2013-02-28 18:03:28 +0100 |
commit | 22e186b4aa88b585e71500c4e9a03bf69b0b6191 (patch) | |
tree | 14c5b7a73cf144ba7cf3066caac088a200f81a72 /.gitignore | |
parent | 372acf7b8eca0614a4a0da93cfbaccbcd459b36b (diff) | |
parent | d31f07bd4b83f858cce589faac56922e12ba670f (diff) | |
download | minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.tar.gz minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.tar.bz2 minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.zip |
Merge remote branch 'origin/master'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index ee210c7c0..353032637 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,12 @@ src/jthread/cmake_install.cmake src/jthread/libjthread.a src/lua/build/ src/lua/CMakeFiles/ +src/cguittfont/CMakeFiles/ +src/cguittfont/libcguittfont.a +src/cguittfont/cmake_install.cmake +src/cguittfont/Makefile +src/json/CMakeFiles/ +src/json/libjson.a CMakeCache.txt CPackConfig.cmake CPackSourceConfig.cmake |