projects / oweals / minetest.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3d53cc2 909075d)
Merge remote-tracking branch 'erlehmann/master'
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Fri, 22 Jul 2011 05:48:22 +0000 (07:48 +0200)
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Fri, 22 Jul 2011 05:48:22 +0000 (07:48 +0200)
commit7c1ea34baf1560cf8757e95f740e3277afdd2ba2
treede25d3deff5b252e154719c6d1abae944d32a749tree | snapshot
parent3d53cc2c1122741df2dd4506ca5e7e188824b5c3commit | diff
parent909075da5c656e42ea6b8c98c9c8ceb11c01fcc1commit | diff
Merge remote-tracking branch 'erlehmann/master'

Conflicts (from the introduction of fr translations):
src/CMakeLists.txt
src/CMakeLists.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.