diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/data2c.s | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/data2c.s')
| -rw-r--r-- | data/data2c.s | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/data/data2c.s b/data/data2c.s index 904009254..86418ce62 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -1,5 +1,3 @@ -@ the second big chunk of data - #include "constants/abilities.h" #include "constants/items.h" #include "constants/moves.h" |