diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-05-20 21:04:35 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-05-20 21:04:35 +0000 |
| commit | 4ea98db3d965f37f0fa90609c1c2671f3d959c50 (patch) | |
| tree | cbba85e27721f787370ad60fb3f64d55724604cd /TextureLoader/src | |
| parent | Resolved conflict (diff) | |
| download | DiligentTools-4ea98db3d965f37f0fa90609c1c2671f3d959c50.tar.gz DiligentTools-4ea98db3d965f37f0fa90609c1c2671f3d959c50.zip | |
Merge from dev branch
Diffstat (limited to 'TextureLoader/src')
| -rw-r--r-- | TextureLoader/src/DDSLoader.cpp | 2 | ||||
| -rw-r--r-- | TextureLoader/src/Image.cpp | 2 | ||||
| -rw-r--r-- | TextureLoader/src/TextureLoader.cpp | 2 | ||||
| -rw-r--r-- | TextureLoader/src/TextureUtilities.cpp | 2 | ||||
| -rw-r--r-- | TextureLoader/src/pch.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/TextureLoader/src/DDSLoader.cpp b/TextureLoader/src/DDSLoader.cpp index 5fef9fe..37bccf6 100644 --- a/TextureLoader/src/DDSLoader.cpp +++ b/TextureLoader/src/DDSLoader.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2016 Egor Yusov +/* Copyright 2015-2017 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 71bca36..e47b311 100644 --- a/TextureLoader/src/Image.cpp +++ b/TextureLoader/src/Image.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2016 Egor Yusov +/* Copyright 2015-2017 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 182363d..14f6f24 100644 --- a/TextureLoader/src/TextureLoader.cpp +++ b/TextureLoader/src/TextureLoader.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2016 Egor Yusov +/* Copyright 2015-2017 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 4d166a6..48f5bd5 100644 --- a/TextureLoader/src/TextureUtilities.cpp +++ b/TextureLoader/src/TextureUtilities.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2016 Egor Yusov +/* Copyright 2015-2017 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 964b3f1..d2921b5 100644 --- a/TextureLoader/src/pch.cpp +++ b/TextureLoader/src/pch.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2016 Egor Yusov +/* Copyright 2015-2017 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. |