summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-07-22 07:48:22 +0200
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-07-22 07:48:22 +0200
commit7c1ea34baf1560cf8757e95f740e3277afdd2ba2 (patch)
treede25d3deff5b252e154719c6d1abae944d32a749 /.hgignore
parent3d53cc2c1122741df2dd4506ca5e7e188824b5c3 (diff)
parent909075da5c656e42ea6b8c98c9c8ceb11c01fcc1 (diff)
downloadminetest-7c1ea34baf1560cf8757e95f740e3277afdd2ba2.tar.gz
minetest-7c1ea34baf1560cf8757e95f740e3277afdd2ba2.tar.bz2
minetest-7c1ea34baf1560cf8757e95f740e3277afdd2ba2.zip
Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations): src/CMakeLists.txt
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions