Merge remote-tracking branch 'origin/master'
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 22 Jan 2013 22:59:19 +0000 (23:59 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 22 Jan 2013 22:59:19 +0000 (23:59 +0100)
1  2 
gtest_sdl_main.cpp

Simple merge