From e9ccc5f28cb17b125c6d7a9601ba1a7d55a2ad18 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 20 May 2017 13:17:34 -0700 Subject: Merge from dev branch --- TextureLoader/include/DDSLoader.h | 2 +- TextureLoader/include/dxgiformat.h | 2 +- TextureLoader/include/pch.h | 2 +- TextureLoader/interface/Image.h | 2 +- TextureLoader/interface/TextureLoader.h | 2 +- TextureLoader/src/DDSLoader.cpp | 2 +- TextureLoader/src/Image.cpp | 2 +- TextureLoader/src/TextureLoader.cpp | 2 +- TextureLoader/src/TextureUtilities.cpp | 2 +- TextureLoader/src/pch.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'TextureLoader') diff --git a/TextureLoader/include/DDSLoader.h b/TextureLoader/include/DDSLoader.h index fb3e332..ed3bc5a 100644 --- a/TextureLoader/include/DDSLoader.h +++ b/TextureLoader/include/DDSLoader.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * 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/TextureLoader/include/dxgiformat.h b/TextureLoader/include/dxgiformat.h index ad8a58d..3b68567 100644 --- a/TextureLoader/include/dxgiformat.h +++ b/TextureLoader/include/dxgiformat.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * 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/TextureLoader/include/pch.h b/TextureLoader/include/pch.h index aa0da96..2e4f192 100644 --- a/TextureLoader/include/pch.h +++ b/TextureLoader/include/pch.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * 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/TextureLoader/interface/Image.h b/TextureLoader/interface/Image.h index eacf315..ae41a0e 100644 --- a/TextureLoader/interface/Image.h +++ b/TextureLoader/interface/Image.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * 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/TextureLoader/interface/TextureLoader.h b/TextureLoader/interface/TextureLoader.h index 341e1e8..3b9769c 100644 --- a/TextureLoader/interface/TextureLoader.h +++ b/TextureLoader/interface/TextureLoader.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * 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/TextureLoader/src/DDSLoader.cpp b/TextureLoader/src/DDSLoader.cpp index 37bccf6..5fef9fe 100644 --- a/TextureLoader/src/DDSLoader.cpp +++ b/TextureLoader/src/DDSLoader.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * 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/TextureLoader/src/Image.cpp b/TextureLoader/src/Image.cpp index e47b311..71bca36 100644 --- a/TextureLoader/src/Image.cpp +++ b/TextureLoader/src/Image.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * 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/TextureLoader/src/TextureLoader.cpp b/TextureLoader/src/TextureLoader.cpp index 14f6f24..182363d 100644 --- a/TextureLoader/src/TextureLoader.cpp +++ b/TextureLoader/src/TextureLoader.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * 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/TextureLoader/src/TextureUtilities.cpp b/TextureLoader/src/TextureUtilities.cpp index 48f5bd5..4d166a6 100644 --- a/TextureLoader/src/TextureUtilities.cpp +++ b/TextureLoader/src/TextureUtilities.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * 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/TextureLoader/src/pch.cpp b/TextureLoader/src/pch.cpp index d2921b5..964b3f1 100644 --- a/TextureLoader/src/pch.cpp +++ b/TextureLoader/src/pch.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -- cgit v1.2.3