diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-05-20 21:00:37 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-05-20 21:00:37 +0000 |
| commit | 109a75aac22463802f03dfc6588951ed0b04892a (patch) | |
| tree | 51e121c71b7e8d30bab1eb400e21497677797a03 /Common/src | |
| parent | Resolved conflicts (diff) | |
| download | DiligentCore-109a75aac22463802f03dfc6588951ed0b04892a.tar.gz DiligentCore-109a75aac22463802f03dfc6588951ed0b04892a.zip | |
Merge from dev branch
Diffstat (limited to 'Common/src')
| -rw-r--r-- | Common/src/BasicFileStream.cpp | 2 | ||||
| -rw-r--r-- | Common/src/DataBlobImpl.cpp | 2 | ||||
| -rw-r--r-- | Common/src/DefaultRawMemoryAllocator.cpp | 2 | ||||
| -rw-r--r-- | Common/src/FixedBlockMemoryAllocator.cpp | 2 | ||||
| -rw-r--r-- | Common/src/Timer.cpp | 2 | ||||
| -rw-r--r-- | Common/src/pch.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Common/src/BasicFileStream.cpp b/Common/src/BasicFileStream.cpp index 4a7efb68..f4cff502 100644 --- a/Common/src/BasicFileStream.cpp +++ b/Common/src/BasicFileStream.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/Common/src/DataBlobImpl.cpp b/Common/src/DataBlobImpl.cpp index 614a0be4..8344a4ee 100644 --- a/Common/src/DataBlobImpl.cpp +++ b/Common/src/DataBlobImpl.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/Common/src/DefaultRawMemoryAllocator.cpp b/Common/src/DefaultRawMemoryAllocator.cpp index 503a1d5b..16d25849 100644 --- a/Common/src/DefaultRawMemoryAllocator.cpp +++ b/Common/src/DefaultRawMemoryAllocator.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/Common/src/FixedBlockMemoryAllocator.cpp b/Common/src/FixedBlockMemoryAllocator.cpp index 72842fe4..8483afcb 100644 --- a/Common/src/FixedBlockMemoryAllocator.cpp +++ b/Common/src/FixedBlockMemoryAllocator.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/Common/src/Timer.cpp b/Common/src/Timer.cpp index 1673333a..57ac9539 100644 --- a/Common/src/Timer.cpp +++ b/Common/src/Timer.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/Common/src/pch.cpp b/Common/src/pch.cpp index 4502a41d..ead1e315 100644 --- a/Common/src/pch.cpp +++ b/Common/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. |