Merge branch 'master' of ssh://repo.or.cz/srv/git/runemen
commit9b47e60f9d1f7a34f7b173f4b27428528a5116fc
authorDriedfruit <driedfruit@mindloop.net>
Sat, 20 Apr 2013 11:35:36 +0000 (20 15:35 +0400)
committerDriedfruit <driedfruit@mindloop.net>
Sat, 20 Apr 2013 11:35:36 +0000 (20 15:35 +0400)
tree7334428abbcb2dad938f1ca757e369dc7478087e
parent8aa047056b1ebf68f967b620dc08ab3c3443bcc9
parent6769d73c5d4cb289f67bf50fae4e97acb1b08d11
Merge branch 'master' of ssh://repo.or.cz/srv/git/runemen
src/mainmenu.c
src/rune2.c