commit d5b850983c432dd7fdfbeac5e459ed822bbeb8b4
Merge: f2ee7829 e1426b00
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Mon Apr 13 21:03:03 2015 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Mon Apr 13 21:03:03 2015 -0400

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

 src/hexen/sb_bar.c | 52 ++++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 24 deletions(-)