Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx'
[xonotic/xonotic.git] / gpl.txt
2010-03-18 xonoticinitial checkin from nexuiz svn r8756