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/java | |
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/logic/java')
-rw-r--r-- | api/logic/java/JavaCheckerJob.cpp | 2 | ||||
-rw-r--r-- | api/logic/java/JavaCheckerJob.h | 2 | ||||
-rw-r--r-- | api/logic/java/JavaInstallList.cpp | 2 | ||||
-rw-r--r-- | api/logic/java/JavaInstallList.h | 2 | ||||
-rw-r--r-- | api/logic/java/JavaUtils.cpp | 2 | ||||
-rw-r--r-- | api/logic/java/JavaUtils.h | 2 | ||||
-rw-r--r-- | api/logic/java/launch/CheckJava.cpp | 2 | ||||
-rw-r--r-- | api/logic/java/launch/CheckJava.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/api/logic/java/JavaCheckerJob.cpp b/api/logic/java/JavaCheckerJob.cpp index a26846f2..223d8f55 100644 --- a/api/logic/java/JavaCheckerJob.cpp +++ b/api/logic/java/JavaCheckerJob.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/java/JavaCheckerJob.h b/api/logic/java/JavaCheckerJob.h index e52970c1..ab8a4bbc 100644 --- a/api/logic/java/JavaCheckerJob.h +++ b/api/logic/java/JavaCheckerJob.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/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp index 605d4c0c..a80ee2da 100644 --- a/api/logic/java/JavaInstallList.cpp +++ b/api/logic/java/JavaInstallList.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/java/JavaInstallList.h b/api/logic/java/JavaInstallList.h index 7e72b5ef..fc7e7a92 100644 --- a/api/logic/java/JavaInstallList.h +++ b/api/logic/java/JavaInstallList.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/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp index 9f7fdcb0..1f9719a8 100644 --- a/api/logic/java/JavaUtils.cpp +++ b/api/logic/java/JavaUtils.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/java/JavaUtils.h b/api/logic/java/JavaUtils.h index 40745ad6..100d942f 100644 --- a/api/logic/java/JavaUtils.h +++ b/api/logic/java/JavaUtils.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/java/launch/CheckJava.cpp b/api/logic/java/launch/CheckJava.cpp index 4ea40084..f4c85245 100644 --- a/api/logic/java/launch/CheckJava.cpp +++ b/api/logic/java/launch/CheckJava.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/java/launch/CheckJava.h b/api/logic/java/launch/CheckJava.h index be247a1b..f0dd2308 100644 --- a/api/logic/java/launch/CheckJava.h +++ b/api/logic/java/launch/CheckJava.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. |