From e9ccc5f28cb17b125c6d7a9601ba1a7d55a2ad18 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sat, 20 May 2017 13:17:34 -0700
Subject: Merge from dev branch

---
 TextureLoader/src/TextureLoader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'TextureLoader/src/TextureLoader.cpp')

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.
-- 
cgit v1.2.3