diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-03-09 23:59:47 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-03-09 23:59:47 +0100 |
| commit | df89183c10a4cb1d442094d5329beb0d724c720b (patch) | |
| tree | 50fcef75b77c2ba29fa58b4fd18eb3f45f33ccfa /.gitignore | |
| parent | d18b97ae3dc05fdf6ea1793ea06ecad52c28f5e2 (diff) | |
| parent | 96ee20072f4e20e279089c6b6e8de63d2da1f94e (diff) | |
| download | PrismLauncher-df89183c10a4cb1d442094d5329beb0d724c720b.tar.gz PrismLauncher-df89183c10a4cb1d442094d5329beb0d724c720b.tar.bz2 PrismLauncher-df89183c10a4cb1d442094d5329beb0d724c720b.zip | |
Merge remote-tracking branch 'origin/fix_ftb_again' into integration_butchery
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -13,6 +13,8 @@ MultiMC5.kdev4 MultiMC.pro.user CMakeLists.txt.user CMakeLists.txt.user.* +/.project +/.settings # Build dirs build |