From 73db4b15086df96c0112e32dbd3293c038855b16 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Mon, 22 Jan 2001 12:54:17 +0000
Subject: [PATCH] joystick support

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 3f176ab89..dfab9db83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+Merged in joystick support from Michael.Wagener@materna.de
 Mouse grabbed during gameplay in SDL/X11, press pause to ungrab.
 --- Version 0.0.8 ---
 Added -nocdrom option, fixed cdrom code.