Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- .hgignore 1 addition, 0 deletions.hgignore
- .hgtags 7 additions, 0 deletions.hgtags
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- README.txt 239 additions, 0 deletionsREADME.txt
- addlicensecomments.sh 0 additions, 9 deletionsaddlicensecomments.sh
- data/gravel.png 0 additions, 0 deletionsdata/gravel.png
- data/item_fence.png 0 additions, 0 deletionsdata/item_fence.png
- data/mossycobble.png 0 additions, 0 deletionsdata/mossycobble.png
- data/treeprop.png 0 additions, 0 deletionsdata/treeprop.png
- doc/changelog.txt 10 additions, 1 deletiondoc/changelog.txt
- doc/mapformat.txt 89 additions, 0 deletionsdoc/mapformat.txt
- doc/protocol.txt 72 additions, 0 deletionsdoc/protocol.txt
- genmap.py 230 additions, 50 deletionsgenmap.py
- minetest.conf.example 20 additions, 4 deletionsminetest.conf.example
- old/Makefile.bak 0 additions, 0 deletionsold/Makefile.bak
- old/minetest.sln 0 additions, 0 deletionsold/minetest.sln
- old/minetest.vcproj 0 additions, 0 deletionsold/minetest.vcproj
- src/CMakeLists.txt 20 additions, 7 deletionssrc/CMakeLists.txt
- src/auth.cpp 264 additions, 0 deletionssrc/auth.cpp
Loading
Please register or sign in to comment