Merge remote-tracking branch 'XTUPLE/4_7_x' into fixPreReq

[xtuple] / LICENSE.txt

diff --git a/LICENSE.txt b/LICENSE.txt
index f84736a..fdb4f7b 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -118,7 +118,7 @@ This License applies to code to which the Initial Developer has attached the not
 
 6.1 New Versions.
 
-Socialtext, Inc. (“Socialtext”)  may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
+Socialtext, Inc. ("Socialtext") may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
 
 6.2 Effect of New Versions.
 
@@ -220,7 +220,7 @@ The Original Code is xTuple ERP: PostBooks Edition.
 
 The Original Developer is not the Initial Developer and is __________. If left blank, the Original Developer is the Initial Developer.
 
-The Initial Developer of the Original Code is OpenMFG, LLC, d/b/a xTuple. All portions of the code written by xTuple are Copyright (c) 1999-2012 OpenMFG, LLC, d/b/a xTuple. All Rights Reserved.
+The Initial Developer of the Original Code is OpenMFG, LLC, d/b/a xTuple. All portions of the code written by xTuple are Copyright (c) 1999-2014 OpenMFG, LLC, d/b/a xTuple. All Rights Reserved.
 
  
 
@@ -244,7 +244,7 @@ EXHIBIT B. Attribution Information
 
  
 
-Attribution Copyright Notice: Copyright (c) 1999-2012 by OpenMFG, LLC, d/b/a xTuple
+Attribution Copyright Notice: Copyright (c) 1999-2014 by OpenMFG, LLC, d/b/a xTuple
 
 Attribution Phrase (not exceeding 10 words): Powered by xTuple ERP
 
@@ -258,5 +258,3 @@ Graphic Image as provided in the Covered Code, if any. (online at www.xtuple.com
 
 Display of Attribution Information is required in Larger Works which are defined in the CPAL as a work which combines Covered Code or portions thereof with code not governed by the terms of the CPAL.
 
-
-