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/gui | |
parent | 7436c94976b2ee0c6f8a9e69d6acb8369ba4cbe6 (diff) | |
parent | 437dec91f9934c83301b15a01331519de612bbf1 (diff) | |
download | PrismLauncher-c1ea42d3d9b793b52d52310f69174f1c5ab9daef.tar.gz PrismLauncher-c1ea42d3d9b793b52d52310f69174f1c5ab9daef.tar.bz2 PrismLauncher-c1ea42d3d9b793b52d52310f69174f1c5ab9daef.zip |
Merge branch 'stable' of https://github.com/Scotsguy/MultiMC5 into develop
Diffstat (limited to 'api/gui')
-rw-r--r-- | api/gui/SkinUtils.cpp | 2 | ||||
-rw-r--r-- | api/gui/SkinUtils.h | 2 | ||||
-rw-r--r-- | api/gui/icons/IconList.cpp | 2 | ||||
-rw-r--r-- | api/gui/icons/IconList.h | 2 | ||||
-rw-r--r-- | api/gui/icons/MMCIcon.cpp | 2 | ||||
-rw-r--r-- | api/gui/icons/MMCIcon.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/api/gui/SkinUtils.cpp b/api/gui/SkinUtils.cpp index 79edb4b9..9b6f63a4 100644 --- a/api/gui/SkinUtils.cpp +++ b/api/gui/SkinUtils.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/gui/SkinUtils.h b/api/gui/SkinUtils.h index f042b908..a7f680e6 100644 --- a/api/gui/SkinUtils.h +++ b/api/gui/SkinUtils.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/gui/icons/IconList.cpp b/api/gui/icons/IconList.cpp index 5bf5f5e7..89380a91 100644 --- a/api/gui/icons/IconList.cpp +++ b/api/gui/icons/IconList.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/gui/icons/IconList.h b/api/gui/icons/IconList.h index 97ed3956..2bacdac3 100644 --- a/api/gui/icons/IconList.h +++ b/api/gui/icons/IconList.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/gui/icons/MMCIcon.cpp b/api/gui/icons/MMCIcon.cpp index a5ab548e..2a2d6e6f 100644 --- a/api/gui/icons/MMCIcon.cpp +++ b/api/gui/icons/MMCIcon.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/gui/icons/MMCIcon.h b/api/gui/icons/MMCIcon.h index d7618bee..c0eb5570 100644 --- a/api/gui/icons/MMCIcon.h +++ b/api/gui/icons/MMCIcon.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. |