Merge origin/master

This commit is contained in:
Jindra Petřík
2016-01-03 14:35:18 +01:00
1878 changed files with 3311 additions and 3076 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2015 JPEXS
* Copyright (C) 2010-2016 JPEXS
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by