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/ModList.cpp | |
| parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
| parent | bba4ed5ab2c98c3d60a141d6a089a49716753615 (diff) | |
| download | PrismLauncher-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.gz PrismLauncher-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.bz2 PrismLauncher-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.zip | |
Merge branch 'develop'
Diffstat (limited to 'logic/ModList.cpp')
| -rw-r--r-- | logic/ModList.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/logic/ModList.cpp b/logic/ModList.cpp index 236f0db6..8ec73955 100644 --- a/logic/ModList.cpp +++ b/logic/ModList.cpp @@ -1,18 +1,17 @@ -// -// 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. -// +/* 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 "ModList.h" #include "LegacyInstance.h" @@ -21,7 +20,7 @@ #include <QUrl> #include <QUuid> #include <QFileSystemWatcher> -#include <logger/QsLog.h> +#include "logger/QsLog.h" ModList::ModList(const QString &dir, const QString &list_file) : QAbstractListModel(), m_dir(dir), m_list_file(list_file) |