diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:22 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:28 +0200 |
| commit | 3560f0de082a8950a84e2e866981f8bdfd05428a (patch) | |
| tree | dfb765f7e590189f05e7807c80be72e6ecf8cc4d /src/guiKeyChangeMenu.h | |
| parent | 5146c826be9386cc2adeb8f678063a2f9cfc1dee (diff) | |
| parent | 81535f6277b66c869cda7125b2aeaf99e8078b92 (diff) | |
| download | minetest-3560f0de082a8950a84e2e866981f8bdfd05428a.tar.gz minetest-3560f0de082a8950a84e2e866981f8bdfd05428a.tar.bz2 minetest-3560f0de082a8950a84e2e866981f8bdfd05428a.zip | |
Merge branch 'upstream/master'
Conflicts:
data/oerkki1.png
src/client.cpp
Diffstat (limited to 'src/guiKeyChangeMenu.h')
0 files changed, 0 insertions, 0 deletions