diff options
| author | Simon Howard | 2011-06-13 22:21:37 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-06-13 22:21:37 +0000 |
| commit | 391e7466b1efb7cbede4a1c356a210d9e7ee616b (patch) | |
| tree | 90d13346d9cd3636df44290ded13d59ae3712543 /src/setup/txt_joybinput.h | |
| parent | fa328faf056affa216f2f3a8764ca0d56262efe9 (diff) | |
| parent | 822664b4ff873d462370e9e96a9d91e6066c221d (diff) | |
| download | chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.tar.gz chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.tar.bz2 chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2347
Diffstat (limited to 'src/setup/txt_joybinput.h')
| -rw-r--r-- | src/setup/txt_joybinput.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/setup/txt_joybinput.h b/src/setup/txt_joybinput.h index b2920b88..69ec4a1f 100644 --- a/src/setup/txt_joybinput.h +++ b/src/setup/txt_joybinput.h @@ -37,6 +37,7 @@ struct txt_joystick_input_s txt_widget_t widget; int *variable; txt_window_t *prompt_window; + int check_conflicts; }; txt_joystick_input_t *TXT_NewJoystickInput(int *variable); |