Merge pull request #291 from purpasmart96/license

License change
author: bunnei 2014-12-21 16:05:44 -0500
committer: bunnei 2014-12-21 16:05:44 -0500
commit: 0de6a08d75eaae68f441453a2f855b3e51a17143 (patch)
tree: e55e49fa1e1cf5298889ca8be9b9f36db806478b /src/core/loader
parent: Update README.md (diff)
parent: License change (diff)
download: yuzu-0de6a08d75eaae68f441453a2f855b3e51a17143.tar.gz
yuzu-0de6a08d75eaae68f441453a2f855b3e51a17143.tar.xz
yuzu-0de6a08d75eaae68f441453a2f855b3e51a17143.zip
8 files changed, 10 insertions, 10 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index 3d84fc5da..4d072871a 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -1,5 +1,5 @@
 // Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2+
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 #include <algorithm>
diff --git a/src/core/loader/3dsx.h b/src/core/loader/3dsx.h
index 848d3ef8a..da8836662 100644
--- a/src/core/loader/3dsx.h
+++ b/src/core/loader/3dsx.h
@@ -1,5 +1,5 @@
 // Copyright 2014 Dolphin Emulator Project / Citra Emulator Project
-// Licensed under GPLv2+
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index c95882f4a..354335014 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -1,5 +1,5 @@
-// Copyright 2013 Dolphin Emulator Project
+// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 #include <string>
diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h
index 5ae88439a..c221cce6d 100644
--- a/src/core/loader/elf.h
+++ b/src/core/loader/elf.h
@@ -1,5 +1,5 @@
-// Copyright 2013 Dolphin Emulator Project / Citra Emulator Project
+// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index b3b58da72..87580cb2a 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -1,5 +1,5 @@
 // Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 #include <string>
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 0f836d285..ec5534d41 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -1,5 +1,5 @@
 // Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 4d23656ec..0dc21699e 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -1,5 +1,5 @@
 // Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 #include <memory>
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index 2fe2a7d82..fd9258970 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -1,5 +1,5 @@
 // Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 #pragma once
author	bunnei	2014-12-21 16:05:44 -0500
committer	bunnei	2014-12-21 16:05:44 -0500
commit	0de6a08d75eaae68f441453a2f855b3e51a17143 (patch)
tree	e55e49fa1e1cf5298889ca8be9b9f36db806478b /src/core/loader
parent	Update README.md (diff)
parent	License change (diff)
download	yuzu-0de6a08d75eaae68f441453a2f855b3e51a17143.tar.gz yuzu-0de6a08d75eaae68f441453a2f855b3e51a17143.tar.xz yuzu-0de6a08d75eaae68f441453a2f855b3e51a17143.zip

diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index 3d84fc5da..4d072871a 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp
@@ -1,5 +1,5 @@
1	// Copyright 2014 Citra Emulator Project	1	// Copyright 2014 Citra Emulator Project
2	// Licensed under GPLv2+	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#include <algorithm>	5	#include <algorithm>


diff --git a/src/core/loader/3dsx.h b/src/core/loader/3dsx.h index 848d3ef8a..da8836662 100644 --- a/src/core/loader/3dsx.h +++ b/src/core/loader/3dsx.h
@@ -1,5 +1,5 @@
1	// Copyright 2014 Dolphin Emulator Project / Citra Emulator Project	1	// Copyright 2014 Dolphin Emulator Project / Citra Emulator Project
2	// Licensed under GPLv2+	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#pragma once	5	#pragma once


diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index c95882f4a..354335014 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp
@@ -1,5 +1,5 @@
1	// Copyright 2013 Dolphin Emulator Project	1	// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project
2	// Licensed under GPLv2	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#include <string>	5	#include <string>


diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h index 5ae88439a..c221cce6d 100644 --- a/src/core/loader/elf.h +++ b/src/core/loader/elf.h
@@ -1,5 +1,5 @@
1	// Copyright 2013 Dolphin Emulator Project / Citra Emulator Project	1	// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project
2	// Licensed under GPLv2	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#pragma once	5	#pragma once


diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index b3b58da72..87580cb2a 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp
@@ -1,5 +1,5 @@
1	// Copyright 2014 Citra Emulator Project	1	// Copyright 2014 Citra Emulator Project
2	// Licensed under GPLv2	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#include <string>	5	#include <string>


diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 0f836d285..ec5534d41 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h
@@ -1,5 +1,5 @@
1	// Copyright 2014 Citra Emulator Project	1	// Copyright 2014 Citra Emulator Project
2	// Licensed under GPLv2	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#pragma once	5	#pragma once


diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 4d23656ec..0dc21699e 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp
@@ -1,5 +1,5 @@
1	// Copyright 2014 Citra Emulator Project	1	// Copyright 2014 Citra Emulator Project
2	// Licensed under GPLv2	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#include <memory>	5	#include <memory>


diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h index 2fe2a7d82..fd9258970 100644 --- a/src/core/loader/ncch.h +++ b/src/core/loader/ncch.h
@@ -1,5 +1,5 @@
1	// Copyright 2014 Citra Emulator Project	1	// Copyright 2014 Citra Emulator Project
2	// Licensed under GPLv2	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#pragma once	5	#pragma once