diff options
| author | Simon Howard | 2011-09-11 23:40:44 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-09-11 23:40:44 +0000 |
| commit | efd15d965dee947a04727bb62f4e2092cf28732f (patch) | |
| tree | 730d99c1e88d5e3145e552ad69dec52d30026d01 /src/setup/txt_mouseinput.h | |
| parent | 4d17ab361e90a75dc6deefd37e6eb2ba0610b386 (diff) | |
| parent | 11024d8214580d63ca7a9e70a121f5ff542a2fce (diff) | |
| download | chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.gz chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.bz2 chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.zip | |
Merge from raven-branch.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2367
Diffstat (limited to 'src/setup/txt_mouseinput.h')
| -rw-r--r-- | src/setup/txt_mouseinput.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/setup/txt_mouseinput.h b/src/setup/txt_mouseinput.h index 57c258eb..ef3ec2aa 100644 --- a/src/setup/txt_mouseinput.h +++ b/src/setup/txt_mouseinput.h @@ -35,6 +35,7 @@ struct txt_mouse_input_s { txt_widget_t widget; int *variable; + int check_conflicts; }; txt_mouse_input_t *TXT_NewMouseInput(int *variable); |