summaryrefslogtreecommitdiffstats
path: root/Common/src
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2017-05-20 20:12:04 +0000
committerEgor Yusov <egor.yusov@gmail.com>2017-05-20 20:12:04 +0000
commitaee75043883900a4952767398201066e62e68724 (patch)
treebe7c54a0cb2e6849aa7f63b5b08721044480c86c /Common/src
parentFixed D3D12 warnings, updated copyright notice (diff)
downloadDiligentCore-aee75043883900a4952767398201066e62e68724.tar.gz
DiligentCore-aee75043883900a4952767398201066e62e68724.zip
Merging Updates from dev branch
Diffstat (limited to 'Common/src')
-rw-r--r--Common/src/BasicFileStream.cpp2
-rw-r--r--Common/src/DataBlobImpl.cpp2
-rw-r--r--Common/src/DefaultRawMemoryAllocator.cpp2
-rw-r--r--Common/src/FixedBlockMemoryAllocator.cpp2
-rw-r--r--Common/src/Timer.cpp2
-rw-r--r--Common/src/pch.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/Common/src/BasicFileStream.cpp b/Common/src/BasicFileStream.cpp
index f4cff502..4a7efb68 100644
--- a/Common/src/BasicFileStream.cpp
+++ b/Common/src/BasicFileStream.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/Common/src/DataBlobImpl.cpp b/Common/src/DataBlobImpl.cpp
index 8344a4ee..614a0be4 100644
--- a/Common/src/DataBlobImpl.cpp
+++ b/Common/src/DataBlobImpl.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/Common/src/DefaultRawMemoryAllocator.cpp b/Common/src/DefaultRawMemoryAllocator.cpp
index 16d25849..503a1d5b 100644
--- a/Common/src/DefaultRawMemoryAllocator.cpp
+++ b/Common/src/DefaultRawMemoryAllocator.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/Common/src/FixedBlockMemoryAllocator.cpp b/Common/src/FixedBlockMemoryAllocator.cpp
index 8483afcb..72842fe4 100644
--- a/Common/src/FixedBlockMemoryAllocator.cpp
+++ b/Common/src/FixedBlockMemoryAllocator.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/Common/src/Timer.cpp b/Common/src/Timer.cpp
index 57ac9539..1673333a 100644
--- a/Common/src/Timer.cpp
+++ b/Common/src/Timer.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/Common/src/pch.cpp b/Common/src/pch.cpp
index ead1e315..4502a41d 100644
--- a/Common/src/pch.cpp
+++ b/Common/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.