diff options
author | Petr Mrázek <peterix@gmail.com> | 2019-01-17 00:51:54 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2019-01-17 00:51:54 +0100 |
commit | c1ea42d3d9b793b52d52310f69174f1c5ab9daef (patch) | |
tree | 4e227eac7a9d134026d7cbf34c56d834b1fe3daf /api/logic/settings | |
parent | 7436c94976b2ee0c6f8a9e69d6acb8369ba4cbe6 (diff) | |
parent | 437dec91f9934c83301b15a01331519de612bbf1 (diff) | |
download | MultiMC-c1ea42d3d9b793b52d52310f69174f1c5ab9daef.tar MultiMC-c1ea42d3d9b793b52d52310f69174f1c5ab9daef.tar.gz MultiMC-c1ea42d3d9b793b52d52310f69174f1c5ab9daef.tar.lz MultiMC-c1ea42d3d9b793b52d52310f69174f1c5ab9daef.tar.xz MultiMC-c1ea42d3d9b793b52d52310f69174f1c5ab9daef.zip |
Merge branch 'stable' of https://github.com/Scotsguy/MultiMC5 into develop
Diffstat (limited to 'api/logic/settings')
-rw-r--r-- | api/logic/settings/INIFile.cpp | 2 | ||||
-rw-r--r-- | api/logic/settings/INIFile.h | 2 | ||||
-rw-r--r-- | api/logic/settings/INISettingsObject.cpp | 2 | ||||
-rw-r--r-- | api/logic/settings/INISettingsObject.h | 2 | ||||
-rw-r--r-- | api/logic/settings/OverrideSetting.cpp | 2 | ||||
-rw-r--r-- | api/logic/settings/OverrideSetting.h | 2 | ||||
-rw-r--r-- | api/logic/settings/PassthroughSetting.cpp | 2 | ||||
-rw-r--r-- | api/logic/settings/PassthroughSetting.h | 2 | ||||
-rw-r--r-- | api/logic/settings/Setting.cpp | 2 | ||||
-rw-r--r-- | api/logic/settings/Setting.h | 2 | ||||
-rw-r--r-- | api/logic/settings/SettingsObject.cpp | 2 | ||||
-rw-r--r-- | api/logic/settings/SettingsObject.h | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/api/logic/settings/INIFile.cpp b/api/logic/settings/INIFile.cpp index 5431443e..42244131 100644 --- a/api/logic/settings/INIFile.cpp +++ b/api/logic/settings/INIFile.cpp @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/INIFile.h b/api/logic/settings/INIFile.h index bdf7fd9a..9406f7bd 100644 --- a/api/logic/settings/INIFile.h +++ b/api/logic/settings/INIFile.h @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/INISettingsObject.cpp b/api/logic/settings/INISettingsObject.cpp index 43791c24..f04a66b5 100644 --- a/api/logic/settings/INISettingsObject.cpp +++ b/api/logic/settings/INISettingsObject.cpp @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/INISettingsObject.h b/api/logic/settings/INISettingsObject.h index 3fc09593..c8ea99ca 100644 --- a/api/logic/settings/INISettingsObject.h +++ b/api/logic/settings/INISettingsObject.h @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/OverrideSetting.cpp b/api/logic/settings/OverrideSetting.cpp index e0e407bd..1efdebac 100644 --- a/api/logic/settings/OverrideSetting.cpp +++ b/api/logic/settings/OverrideSetting.cpp @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/OverrideSetting.h b/api/logic/settings/OverrideSetting.h index db28e2fc..f99caff1 100644 --- a/api/logic/settings/OverrideSetting.h +++ b/api/logic/settings/OverrideSetting.h @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/PassthroughSetting.cpp b/api/logic/settings/PassthroughSetting.cpp index 58522385..beee4152 100644 --- a/api/logic/settings/PassthroughSetting.cpp +++ b/api/logic/settings/PassthroughSetting.cpp @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/PassthroughSetting.h b/api/logic/settings/PassthroughSetting.h index 7999be97..00212072 100644 --- a/api/logic/settings/PassthroughSetting.h +++ b/api/logic/settings/PassthroughSetting.h @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/Setting.cpp b/api/logic/settings/Setting.cpp index 8bb42f5e..419dfa2f 100644 --- a/api/logic/settings/Setting.cpp +++ b/api/logic/settings/Setting.cpp @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/Setting.h b/api/logic/settings/Setting.h index 0e9224c5..9d827c72 100644 --- a/api/logic/settings/Setting.h +++ b/api/logic/settings/Setting.h @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/SettingsObject.cpp b/api/logic/settings/SettingsObject.cpp index d1851415..b4fc5a68 100644 --- a/api/logic/settings/SettingsObject.cpp +++ b/api/logic/settings/SettingsObject.cpp @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/logic/settings/SettingsObject.h b/api/logic/settings/SettingsObject.h index 10a34f81..11dc50ca 100644 --- a/api/logic/settings/SettingsObject.h +++ b/api/logic/settings/SettingsObject.h @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. |