diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-14 14:00:23 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-14 14:00:23 +0100 |
| commit | 8f856f55732e6427e9b4994343b01f9ac0e0daee (patch) | |
| tree | 09ca49c42d53ed4510d0aa7231bdb2cdad0be459 /.gitignore | |
| parent | 4623aa44f58575b6d2ceb0b047945ffeb0081f65 (diff) | |
| parent | 1167a66ac89d1510fbb522544e9733cc086f35eb (diff) | |
| download | PrismLauncher-8f856f55732e6427e9b4994343b01f9ac0e0daee.tar.gz PrismLauncher-8f856f55732e6427e9b4994343b01f9ac0e0daee.tar.bz2 PrismLauncher-8f856f55732e6427e9b4994343b01f9ac0e0daee.zip | |
Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into develop
Conflicts:
MultiMC.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -10,6 +10,7 @@ resources/CMakeFiles resources/MultiMCLauncher.jar *~ *.swp +html/ # Ctags File tags |