diff options
author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 19:46:55 +0200 |
---|---|---|
committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 19:47:55 +0200 |
commit | 96bee29e35f0790657fbd8bb67d2af79b498255c (patch) | |
tree | 0712c75629ab16fad84af11050ef94d8c8ac8137 /src/guiKeyChangeMenu.h | |
parent | 82ea53499710c9a4e92ec595d8c14c417bdd0ee6 (diff) | |
parent | f2051c98223d087c8ba3d7e4514935781c93ed1c (diff) | |
download | minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.tar.gz minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.tar.bz2 minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.zip |
Merge branch 'upstream/master'
Diffstat (limited to 'src/guiKeyChangeMenu.h')
-rw-r--r-- | src/guiKeyChangeMenu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h index 389ce7aee..e9e359c3c 100644 --- a/src/guiKeyChangeMenu.h +++ b/src/guiKeyChangeMenu.h @@ -1,5 +1,5 @@ /* - Minetest-delta + Minetest-c55 Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com> Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com> Copyright (C) 2011 teddydestodes <derkomtur@schattengang.net> |