commit 12bac584e165493f91435ffacb2b4633c593346c
Merge: 8659cfd6 da2fa989
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Wed Apr 30 00:07:14 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Wed Apr 30 00:07:14 2014 -0400

    Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

 src/i_system.c | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)