diff options
| author | stonedDiscord <3462709-stonedDiscord@users.noreply.gitlab.com> | 2019-07-20 16:20:05 +0000 |
|---|---|---|
| committer | stonedDiscord <3462709-stonedDiscord@users.noreply.gitlab.com> | 2019-07-20 16:20:05 +0000 |
| commit | 4a2a167f7d552141a2e3450d350b57d2f7b342a0 (patch) | |
| tree | e632403791b35055860e20e27e7f7488c8ba380d /.gitignore | |
| parent | 785168f8d36fc7c075f36cd88f13984c933b903c (diff) | |
| parent | 2a5d569511af7d9411cd73f2dfd329da38730dc0 (diff) | |
Merge branch 'master' into 'bass-optional'
# Conflicts:
# Attorney_Online.pro
# include/aoapplication.h
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -5,6 +5,7 @@ *.so *.pro.autosave base_override.h +.DS_Store base-full/ base/ |