diff options
| author | Sky <git@bunnies.cc> | 2013-11-06 17:02:23 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-11-06 17:02:23 +0000 |
| commit | 7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a (patch) | |
| tree | 2753d1ee11dad2cf1c4ce1e8a28ead92214f2f1c /logic/OneSixInstance.cpp | |
| parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
| parent | bba4ed5ab2c98c3d60a141d6a089a49716753615 (diff) | |
| download | MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.gz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.lz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.xz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.zip | |
Merge branch 'develop'
Diffstat (limited to 'logic/OneSixInstance.cpp')
| -rw-r--r-- | logic/OneSixInstance.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 7539d8e5..5c93236b 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -1,3 +1,18 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "OneSixInstance.h" #include "OneSixInstance_p.h" #include "OneSixUpdate.h" @@ -8,8 +23,8 @@ #include <pathutils.h> #include <cmdutils.h> #include <JlCompress.h> -#include <gui/OneSixModEditDialog.h> -#include <logger/QsLog.h> +#include "gui/dialogs/OneSixModEditDialog.h" +#include "logger/QsLog.h" OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *setting_obj, QObject *parent) |