diff --git a/src/Common/Configurator.cpp b/src/Common/Configurator.cpp
index 2a8ad16..994d105 100644
--- a/src/Common/Configurator.cpp
+++ b/src/Common/Configurator.cpp
@@ -1,13 +1,16 @@
-// SwiftShader Software Renderer
+// Copyright 2016 The SwiftShader Authors. All Rights Reserved.
 //
-// Copyright(c) 2005-2012 TransGaming Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
-// All rights reserved. No part of this software may be copied, distributed, transmitted,
-// transcribed, stored in a retrieval system, translated into any human or computer
-// language by any means, or disclosed to third parties without the explicit written
-// agreement of TransGaming Inc. Without such an agreement, no rights or licenses, express
-// or implied, including but not limited to any patent rights, are granted to you.
+//    http://www.apache.org/licenses/LICENSE-2.0
 //
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #include "Configurator.hpp"
 
@@ -189,7 +192,7 @@
 		}
 
 		int valueID = findValue(keyID, valueName);
-		
+
 		if(valueID == -1)
 		{
 			sections[keyID].names.resize(sections[keyID].names.size() + 1, valueName);
@@ -217,7 +220,7 @@
 
 		sprintf(svalue, "%d", defaultValue);
 
-		return atoi(getValue(keyName, valueName, svalue).c_str()); 
+		return atoi(getValue(keyName, valueName, svalue).c_str());
 	}
 
 	bool Configurator::getBoolean(string keyName, string valueName, bool defaultValue) const
@@ -231,7 +234,7 @@
 
 		sprintf(svalue, "%f", defaultValue);
 
-		return atof(getValue(keyName, valueName, svalue).c_str()); 
+		return atof(getValue(keyName, valueName, svalue).c_str());
 	}
 
 	unsigned int Configurator::getFormatted(string keyName, string valueName, char *format,
