diff options
| author | Tec <daniel112092@gmail.com> | 2019-02-06 20:01:23 +0100 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2019-02-06 20:01:23 +0100 |
| commit | e87c28605faa95d270073a036c111c0b61d88e1b (patch) | |
| tree | 298f806f565668780da81fb4c7f6200df57fcd2c /.gitignore | |
| parent | 6cd9f79bb86961fdb5b1090461ea41685c3fd965 (diff) | |
| parent | 1390294c9c7601e97edb1f2cf5c038e0e934a59d (diff) | |
| download | GT5-Unofficial-e87c28605faa95d270073a036c111c0b61d88e1b.tar.gz GT5-Unofficial-e87c28605faa95d270073a036c111c0b61d88e1b.tar.bz2 GT5-Unofficial-e87c28605faa95d270073a036c111c0b61d88e1b.zip | |
Merge branch 'master' into bassAdditions
# Conflicts:
# .gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 0a26ef69b4..4b05cbe9e4 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,6 @@ SetupDevWorkspaces.bat *.db *.log .idea/ - \.directory asm/ config/ |