diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-02-06 07:09:32 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-02-06 07:09:32 +0100 |
| commit | 18b087e99280d2c8d5a6115a178f9e6f03606656 (patch) | |
| tree | fbf58928dabbae4540de3d7725f9ac70274fa586 /.gitignore | |
| parent | 4e9006769e3554524096d45f8a1ce16ccfa78bfc (diff) | |
| parent | e475f5d51251ae57da0480bbadc9cb32a8bc72b2 (diff) | |
| download | PrismLauncher-18b087e99280d2c8d5a6115a178f9e6f03606656.tar.gz PrismLauncher-18b087e99280d2c8d5a6115a178f9e6f03606656.tar.bz2 PrismLauncher-18b087e99280d2c8d5a6115a178f9e6f03606656.zip | |
Merge https://github.com/Forkk/MultiMC5
Conflicts:
gui/mainwindow.ui
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,6 +1,9 @@ Thumbs.db .kdev4 MultiMC5.kdev4 +MultiMC.pro.user +CMakeLists.txt.user +.user build resources/CMakeFiles resources/MultiMCLauncher.jar |