diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-22 15:18:04 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-22 15:18:04 (GMT) |
| commit | c9725c60047869fb0d645eb9e8cc259748cc9c0e (patch) | |
| tree | 813862fe030dd2184092ab482aeb1112172d13cd /includes/interface.h | |
| parent | ac7eda80a545ba8c0cbab80236df88570e1d33ad (diff) | |
| parent | a84234dcd4e5a3dfb4a62d73ff07df1e01bed086 (diff) | |
| download | powder-c9725c60047869fb0d645eb9e8cc259748cc9c0e.zip powder-c9725c60047869fb0d645eb9e8cc259748cc9c0e.tar.gz | |
Merge branch 'upstream' into dev
Conflicts:
src/main.c
Diffstat (limited to 'includes/interface.h')
| -rw-r--r-- | includes/interface.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/includes/interface.h b/includes/interface.h index a49f75f..ea1f9a5 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -52,10 +52,9 @@ static menu_wall mwalls[] = #define SC_LIQUID 4 #define SC_NUCLEAR 7 #define SC_LIFE 9 -#define SC_LIFE2 10 #define SC_CRACKER 12 #define SC_CRACKER2 13 -#define SC_TOTAL 11 +#define SC_TOTAL 10 static menu_section msections[] = { |