fix conflicts

This commit is contained in:
muddmaker
2015-03-21 18:15:41 -07:00
481 changed files with 58747 additions and 67796 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2006-2014 LOVE Development Team
* Copyright (c) 2006-2015 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages