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/interface | |
| parent | Resolved conflicts (diff) | |
| download | DiligentCore-109a75aac22463802f03dfc6588951ed0b04892a.tar.gz DiligentCore-109a75aac22463802f03dfc6588951ed0b04892a.zip | |
Merge from dev branch
Diffstat (limited to 'Common/interface')
| -rw-r--r-- | Common/interface/AdvancedMath.h | 2 | ||||
| -rw-r--r-- | Common/interface/BasicMath.h | 2 | ||||
| -rw-r--r-- | Common/interface/DataBlob.h | 2 | ||||
| -rw-r--r-- | Common/interface/FileStream.h | 2 | ||||
| -rw-r--r-- | Common/interface/MemoryAllocator.h | 2 | ||||
| -rw-r--r-- | Common/interface/Object.h | 2 | ||||
| -rw-r--r-- | Common/interface/ReferenceCounters.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/Common/interface/AdvancedMath.h b/Common/interface/AdvancedMath.h index d6623875..d90488f7 100644 --- a/Common/interface/AdvancedMath.h +++ b/Common/interface/AdvancedMath.h @@ -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/interface/BasicMath.h b/Common/interface/BasicMath.h index 19d54ec2..b1ecdf17 100644 --- a/Common/interface/BasicMath.h +++ b/Common/interface/BasicMath.h @@ -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/interface/DataBlob.h b/Common/interface/DataBlob.h index abc60215..28e483fc 100644 --- a/Common/interface/DataBlob.h +++ b/Common/interface/DataBlob.h @@ -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/interface/FileStream.h b/Common/interface/FileStream.h index 75aba909..ab037b57 100644 --- a/Common/interface/FileStream.h +++ b/Common/interface/FileStream.h @@ -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/interface/MemoryAllocator.h b/Common/interface/MemoryAllocator.h index d25e2cf0..8221ffdc 100644 --- a/Common/interface/MemoryAllocator.h +++ b/Common/interface/MemoryAllocator.h @@ -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/interface/Object.h b/Common/interface/Object.h index b8153c1e..88181522 100644 --- a/Common/interface/Object.h +++ b/Common/interface/Object.h @@ -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/interface/ReferenceCounters.h b/Common/interface/ReferenceCounters.h index 64ced644..54c89b7a 100644 --- a/Common/interface/ReferenceCounters.h +++ b/Common/interface/ReferenceCounters.h @@ -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. |