doom · commit

commit 031dbfb4ccd727ef660f72774cb767885fd9eae6
Merge: 66f090f0 7bc07936
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Sat Sep 19 21:02:38 2015 +0200
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Sat Sep 19 21:02:38 2015 +0200

    Merge branch 'sdl2-branch' of https://github.com/chocolate-doom/chocolate-doom into sdl2-branch

 msvc/doom.vcproj    |  8 ++++++--
 msvc/heretic.vcproj |  8 ++------
 msvc/hexen.vcproj   | 12 ++----------
 msvc/server.vcproj  |  4 ++--
 msvc/setup.vcproj   |  4 ++--
 msvc/strife.vcproj  |  4 ++--
 src/i_video.c       |  8 ++++----
 7 files changed, 20 insertions(+), 28 deletions(-)