Merge branch 'develop'

SublimeText · Jan 24, 2016 · ebc1361 · ebc1361
2 parents 3f8e284 + 0263531
commit ebc1361
Show file tree

Hide file tree

Showing 83 changed files with 1,028 additions and 12,815 deletions.
diff --git a/.hgignore b/.hgignore
diff --git a/.hgtags b/.hgtags
diff --git a/AAA.py b/AAA.py
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -1 +1,2 @@
 guillermooo (Guillermo L�pez-Anglada)
+FichteFoll
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -1,2 +1 @@
-FichteFoll
 MattDMo
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,10 +1,23 @@
 License
 =======
 
-Copyright (c) 2014 Guillermo L�pez-Anglada (Vintageous)
+Copyright (c) 2014 Guillermo L�pez-Anglada (Vintageous),
+                   FichteFoll <fichtefoll2@googlemail.com>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Lib/_py2/ordereddict.py b/Lib/_py2/ordereddict.py
diff --git a/Lib/_py2/yaml/LICENSE b/Lib/_py2/yaml/LICENSE
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		guillermooo (Guillermo L�pez-Anglada)
		FichteFoll