diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 09:46:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 09:46:02 -0400 |
| commit | 78535eea89e8b71f37e188289793e3e18c9bb985 (patch) | |
| tree | c3d7ec29b849e810cc6bc90827f9053a4f486b64 /include/constants | |
| parent | f4e6816db9622dfa93466138ed075075009295b8 (diff) | |
| parent | 3f477dae36c99bcb03a38be251dbef2f7e344ebc (diff) | |
Merge branch 'master' into modern_gcc
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 |