]> git.jsancho.org Git - lugaru.git/commit
merge
authorCôme BERNIGAUD <come.bernigaud@gmail.com>
Mon, 24 May 2010 19:37:39 +0000 (21:37 +0200)
committerCôme BERNIGAUD <come.bernigaud@gmail.com>
Mon, 24 May 2010 19:37:39 +0000 (21:37 +0200)
commit1a0ad4362ed618c1a25508530dfeeb4a0f6ef345
treeda6b5f2d1612093fc886d34b164f18e3c091e6e4
parentf250ee8330a466b35a7ba2975d3d3fed508068c2
parentc0a6dc9211fd7855250be34151a70ec4bceb5126
merge
Data/config.txt
Source/GameDraw.cpp
Source/GameTick.cpp
Source/Globals.cpp
Source/OpenGL_Windows.cpp
Source/Settings.cpp