Merge pull request #116 from toddrjen/master

toddrjen · toddrjen · commit 7081af7e192c · 2014-01-13T05:59:55.000-08:00
update copyrights to 2014
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013, Neo authors and contributors
+Copyright (c) 2010-2014, Neo authors and contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/README.rst b/README.rst
@@ -37,5 +37,5 @@ More information
 
 For installation instructions, see doc/source/install.rst
 
-:copyright: Copyright 2010-2013 by the Neo team, see AUTHORS.
+:copyright: Copyright 2010-2014 by the Neo team, see AUTHORS.
 :license: 3-Clause Revised BSD License, see LICENSE.txt for details.
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -42,7 +42,7 @@
 
 # General information about the project.
 project = u'Neo'
-copyright = u'2010-2013, ' + AUTHORS
+copyright = u'2010-2014, ' + AUTHORS
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2010-2013, Neo authors and contributors`
	`1`	`+Copyright (c) 2010-2014, Neo authors and contributors`
`2`	`2`	`All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:`