Merge branch 'upstream/master'
-rw-r--r-- 382 .gitignore
-rw-r--r-- 412 .hgignore
-rw-r--r-- 885 .hgtags
-rw-r--r-- 3296 CMakeLists.txt
-rw-r--r-- 1210 README
-rw-r--r-- 8619 README.txt
drwxr-xr-x - cmake
drwxr-xr-x - data
drwxr-xr-x - doc
-rwxr-xr-x 6168 genmap.py
-rwxr-xr-x 2187 makepackage_binary.sh
-rw-r--r-- 4460 minetest.conf.example
drwxr-xr-x - minetestmapper
drwxr-xr-x - misc
drwxr-xr-x - old
-rw-r--r-- 3439 pnoise.py
drwxr-xr-x - src
drwxr-xr-x - util