diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
| commit | e03220c21de7c33e1ddeb3fd0585378da37d8b51 (patch) | |
| tree | 57da1db9027de960c4b066bdcf6ab17c03753791 /include/constants | |
| parent | 00b44d588618c9a0feff1285183c183f1c97f1bb (diff) | |
| parent | d442be12102ed3493c04b3688f37a4ffad6606f7 (diff) | |
Merge branch 'master' into filenames_1
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/battle.h (renamed from include/constants/battle_constants.h) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/include/constants/battle_constants.h b/include/constants/battle.h index afa7fecf1..afa7fecf1 100644 --- a/include/constants/battle_constants.h +++ b/include/constants/battle.h |