diff --git a/COPYING b/COPYING deleted file mode 100644 index 6798e05..0000000 --- a/COPYING +++ /dev/null @@ -1,13 +0,0 @@ -Copyright lutin Edouard DUPIN - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..fa0086a --- /dev/null +++ b/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/README.rst b/README.rst index d9e511a..34b5948 100644 --- a/README.rst +++ b/README.rst @@ -67,16 +67,16 @@ Install pip on MacOs: sudo easy_install pip -License (APACHE v2.0) +License (MPL v2.0) --------------------- Copyright lutin Edouard DUPIN -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the Mozilla Public License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.mozilla.org/MPL/2.0/ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/bin/lutin b/bin/lutin index fe85c49..35fbce8 100755 --- a/bin/lutin +++ b/bin/lutin @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## # for path inspection: diff --git a/doc/030_Create_a_new_module.md b/doc/030_Create_a_new_module.md index e8e69f9..5567cbf 100644 --- a/doc/030_Create_a_new_module.md +++ b/doc/030_Create_a_new_module.md @@ -45,6 +45,7 @@ def get_desc(): # "BSD-1" / "BSD-2" / "BSD-3" / "BSD-4" # "GPL-1" / "GPL-2" / "GPL-3" # "LGPL-1" / "LGPL-2" / "LGPL-3" +# "MPL-1" / "MPL-1.1" / "MPL-2" # PROPRIETARY # ... # Note: this fucntion is optionnal. @@ -386,6 +387,7 @@ def get_desc(): # "BSD-1" / "BSD-2" / "BSD-3" / "BSD-4" # "GPL-1" / "GPL-2" / "GPL-3" # "LGPL-1" / "LGPL-2" / "LGPL-3" +# "MPL-1" / "MPL-1.1" / "MPL-2" # PROPRIETARY # ... # Note: this fucntion is optionnal. diff --git a/doc/mainpage.md b/doc/mainpage.md index b2b7010..ff7fae9 100644 --- a/doc/mainpage.md +++ b/doc/mainpage.md @@ -108,16 +108,16 @@ Tutorals: {#lutin_mainpage_tutorial} - @ref lutin_ios -License (APACHE v2.0) {#lutin_mainpage_licence} +License (MPL v2.0) {#lutin_mainpage_licence} ===================== Copyright lutin Edouard DUPIN -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the Mozilla Public License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.mozilla.org/MPL/2.0/ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/lutin/__init__.py b/lutin/__init__.py index 6830772..0907ef6 100755 --- a/lutin/__init__.py +++ b/lutin/__init__.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import os import sys diff --git a/lutin/arg.py b/lutin/arg.py index c535a0b..38bbf53 100644 --- a/lutin/arg.py +++ b/lutin/arg.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import sys from . import debug diff --git a/lutin/builder.py b/lutin/builder.py index b1e8220..0515550 100644 --- a/lutin/builder.py +++ b/lutin/builder.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import sys import os diff --git a/lutin/debug.py b/lutin/debug.py index 1472f74..99ad59f 100644 --- a/lutin/debug.py +++ b/lutin/debug.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import os diff --git a/lutin/depend.py b/lutin/depend.py index 1104396..21a44ab 100644 --- a/lutin/depend.py +++ b/lutin/depend.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import os # Local import diff --git a/lutin/env.py b/lutin/env.py index 5079565..c29a3d2 100644 --- a/lutin/env.py +++ b/lutin/env.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## # Local import diff --git a/lutin/heritage.py b/lutin/heritage.py index def0b75..84c6b81 100644 --- a/lutin/heritage.py +++ b/lutin/heritage.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import sys import copy diff --git a/lutin/host.py b/lutin/host.py index 3484ae4..3e93824 100644 --- a/lutin/host.py +++ b/lutin/host.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import platform import sys diff --git a/lutin/image.py b/lutin/image.py index c3659b1..c3a6762 100644 --- a/lutin/image.py +++ b/lutin/image.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import platform import os diff --git a/lutin/license.py b/lutin/license.py index cc954a8..ce5e917 100644 --- a/lutin/license.py +++ b/lutin/license.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## license_base = { @@ -14,7 +14,7 @@ license_base = { "contaminate-static":False, "contaminate-dynamic":False, "redistribute-source":False, - "title":"APACHE v2.0 license", + "title":"MPL v2.0 license", "licence-file":"licence/apache-2.txt" }, "GPL-2": { @@ -88,7 +88,31 @@ license_base = { "redistribute-source":False, "title":"PNG License", "licence-file":"licence/png.txt" - } + }, + "MPL-1": { + "generic":True, + "contaminate-static":False, + "contaminate-dynamic":False, + "redistribute-source":True, + "title":"MPL: Mozilla Public Licence v1.0", + "licence-file":"licence/MPL-1.txt" + }, + "MPL-1.1": { + "generic":True, + "contaminate-static":False, + "contaminate-dynamic":False, + "redistribute-source":True, + "title":"MPL: Mozilla Public Licence v1.1", + "licence-file":"licence/MPL-1.1.txt" + }, + "MPL-2": { + "generic":True, + "contaminate-static":False, + "contaminate-dynamic":False, + "redistribute-source":True, + "title":"MPL: Mozilla Public Licence v2.0", + "licence-file":"licence/MPL-2.txt" + }, } def get_basic_list(): diff --git a/lutin/macro.py b/lutin/macro.py index b309b7b..b4e212a 100644 --- a/lutin/macro.py +++ b/lutin/macro.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import sys diff --git a/lutin/module.py b/lutin/module.py index 0e497eb..5ee8a23 100644 --- a/lutin/module.py +++ b/lutin/module.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import sys diff --git a/lutin/multiprocess.py b/lutin/multiprocess.py index d41ae1c..79b3af5 100644 --- a/lutin/multiprocess.py +++ b/lutin/multiprocess.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import sys diff --git a/lutin/system.py b/lutin/system.py index 829ee6b..b5e8d91 100644 --- a/lutin/system.py +++ b/lutin/system.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import sys diff --git a/lutin/target.py b/lutin/target.py index a3f4b64..023a0fe 100644 --- a/lutin/target.py +++ b/lutin/target.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import sys diff --git a/lutin/tools.py b/lutin/tools.py index 0933143..0acd921 100644 --- a/lutin/tools.py +++ b/lutin/tools.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import os diff --git a/lutin/z_builder/__init__.py b/lutin/z_builder/__init__.py index 069d7ba..e12dde4 100644 --- a/lutin/z_builder/__init__.py +++ b/lutin/z_builder/__init__.py @@ -5,5 +5,5 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## diff --git a/lutin/z_builder/lutinBuilder_binary.py b/lutin/z_builder/lutinBuilder_binary.py index d87d8b7..2c8dfb7 100644 --- a/lutin/z_builder/lutinBuilder_binary.py +++ b/lutin/z_builder/lutinBuilder_binary.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_builder/lutinBuilder_c.py b/lutin/z_builder/lutinBuilder_c.py index 9808699..acc829b 100644 --- a/lutin/z_builder/lutinBuilder_c.py +++ b/lutin/z_builder/lutinBuilder_c.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_builder/lutinBuilder_cpp.py b/lutin/z_builder/lutinBuilder_cpp.py index 50dac42..59e0916 100644 --- a/lutin/z_builder/lutinBuilder_cpp.py +++ b/lutin/z_builder/lutinBuilder_cpp.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_builder/lutinBuilder_jar.py b/lutin/z_builder/lutinBuilder_jar.py index 88f6dc8..3b110f3 100644 --- a/lutin/z_builder/lutinBuilder_jar.py +++ b/lutin/z_builder/lutinBuilder_jar.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_builder/lutinBuilder_java.py b/lutin/z_builder/lutinBuilder_java.py index 213c055..58b1bc4 100644 --- a/lutin/z_builder/lutinBuilder_java.py +++ b/lutin/z_builder/lutinBuilder_java.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_builder/lutinBuilder_javah.py b/lutin/z_builder/lutinBuilder_javah.py index 4f366fb..5c70fc3 100644 --- a/lutin/z_builder/lutinBuilder_javah.py +++ b/lutin/z_builder/lutinBuilder_javah.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_builder/lutinBuilder_libraryDynamic.py b/lutin/z_builder/lutinBuilder_libraryDynamic.py index a85b3fb..272470a 100644 --- a/lutin/z_builder/lutinBuilder_libraryDynamic.py +++ b/lutin/z_builder/lutinBuilder_libraryDynamic.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_builder/lutinBuilder_libraryStatic.py b/lutin/z_builder/lutinBuilder_libraryStatic.py index e6030ca..b264687 100644 --- a/lutin/z_builder/lutinBuilder_libraryStatic.py +++ b/lutin/z_builder/lutinBuilder_libraryStatic.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_builder/lutinBuilder_m.py b/lutin/z_builder/lutinBuilder_m.py index 6477711..d2306e5 100644 --- a/lutin/z_builder/lutinBuilder_m.py +++ b/lutin/z_builder/lutinBuilder_m.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_builder/lutinBuilder_mm.py b/lutin/z_builder/lutinBuilder_mm.py index 16790bb..a1ce26b 100644 --- a/lutin/z_builder/lutinBuilder_mm.py +++ b/lutin/z_builder/lutinBuilder_mm.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_builder/lutinBuilder_s.py b/lutin/z_builder/lutinBuilder_s.py index 75aea19..9cc2475 100644 --- a/lutin/z_builder/lutinBuilder_s.py +++ b/lutin/z_builder/lutinBuilder_s.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## ## diff --git a/lutin/z_system/__init__.py b/lutin/z_system/__init__.py index 069d7ba..e12dde4 100644 --- a/lutin/z_system/__init__.py +++ b/lutin/z_system/__init__.py @@ -5,5 +5,5 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## diff --git a/lutin/z_system/lutinSystem_Android_ADMOD.py b/lutin/z_system/lutinSystem_Android_ADMOD.py index f1aeafd..ce37619 100644 --- a/lutin/z_system/lutinSystem_Android_ADMOD.py +++ b/lutin/z_system/lutinSystem_Android_ADMOD.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Android_SDK.py b/lutin/z_system/lutinSystem_Android_SDK.py index ee043b2..9f59432 100644 --- a/lutin/z_system/lutinSystem_Android_SDK.py +++ b/lutin/z_system/lutinSystem_Android_SDK.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Android_c.py b/lutin/z_system/lutinSystem_Android_c.py index 0118adc..4dc5dcf 100644 --- a/lutin/z_system/lutinSystem_Android_c.py +++ b/lutin/z_system/lutinSystem_Android_c.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Android_cxx.py b/lutin/z_system/lutinSystem_Android_cxx.py index 3b2ab39..c3099cb 100644 --- a/lutin/z_system/lutinSystem_Android_cxx.py +++ b/lutin/z_system/lutinSystem_Android_cxx.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Android_m.py b/lutin/z_system/lutinSystem_Android_m.py index b2894b9..d6319a0 100644 --- a/lutin/z_system/lutinSystem_Android_m.py +++ b/lutin/z_system/lutinSystem_Android_m.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Android_opengl.py b/lutin/z_system/lutinSystem_Android_opengl.py index f2cb407..3f7a681 100644 --- a/lutin/z_system/lutinSystem_Android_opengl.py +++ b/lutin/z_system/lutinSystem_Android_opengl.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Android_pthread.py b/lutin/z_system/lutinSystem_Android_pthread.py index 15d15e7..78cd8d4 100644 --- a/lutin/z_system/lutinSystem_Android_pthread.py +++ b/lutin/z_system/lutinSystem_Android_pthread.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Android_z.py b/lutin/z_system/lutinSystem_Android_z.py index 79cd581..c21e64a 100644 --- a/lutin/z_system/lutinSystem_Android_z.py +++ b/lutin/z_system/lutinSystem_Android_z.py @@ -4,7 +4,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_CoreAudio.py b/lutin/z_system/lutinSystem_IOs_CoreAudio.py index 433cfeb..7a2195d 100644 --- a/lutin/z_system/lutinSystem_IOs_CoreAudio.py +++ b/lutin/z_system/lutinSystem_IOs_CoreAudio.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_CoreGraphics.py b/lutin/z_system/lutinSystem_IOs_CoreGraphics.py index 3f78616..83d4ff8 100644 --- a/lutin/z_system/lutinSystem_IOs_CoreGraphics.py +++ b/lutin/z_system/lutinSystem_IOs_CoreGraphics.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_Foundation.py b/lutin/z_system/lutinSystem_IOs_Foundation.py index af6dee3..f9e88d4 100644 --- a/lutin/z_system/lutinSystem_IOs_Foundation.py +++ b/lutin/z_system/lutinSystem_IOs_Foundation.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_GLKit.py b/lutin/z_system/lutinSystem_IOs_GLKit.py index 11a6891..e31da1d 100644 --- a/lutin/z_system/lutinSystem_IOs_GLKit.py +++ b/lutin/z_system/lutinSystem_IOs_GLKit.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_QuartzCore.py b/lutin/z_system/lutinSystem_IOs_QuartzCore.py index 320977d..5ed0555 100644 --- a/lutin/z_system/lutinSystem_IOs_QuartzCore.py +++ b/lutin/z_system/lutinSystem_IOs_QuartzCore.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_UIKit.py b/lutin/z_system/lutinSystem_IOs_UIKit.py index ee879cf..94f799d 100644 --- a/lutin/z_system/lutinSystem_IOs_UIKit.py +++ b/lutin/z_system/lutinSystem_IOs_UIKit.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_c.py b/lutin/z_system/lutinSystem_IOs_c.py index 87a4344..84d9df7 100644 --- a/lutin/z_system/lutinSystem_IOs_c.py +++ b/lutin/z_system/lutinSystem_IOs_c.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_cxx.py b/lutin/z_system/lutinSystem_IOs_cxx.py index bac4c00..c99f555 100644 --- a/lutin/z_system/lutinSystem_IOs_cxx.py +++ b/lutin/z_system/lutinSystem_IOs_cxx.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_m.py b/lutin/z_system/lutinSystem_IOs_m.py index b2894b9..d6319a0 100644 --- a/lutin/z_system/lutinSystem_IOs_m.py +++ b/lutin/z_system/lutinSystem_IOs_m.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_opengl.py b/lutin/z_system/lutinSystem_IOs_opengl.py index 09df64a..0c23b19 100644 --- a/lutin/z_system/lutinSystem_IOs_opengl.py +++ b/lutin/z_system/lutinSystem_IOs_opengl.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_IOs_pthread.py b/lutin/z_system/lutinSystem_IOs_pthread.py index 4ad5770..308bea0 100644 --- a/lutin/z_system/lutinSystem_IOs_pthread.py +++ b/lutin/z_system/lutinSystem_IOs_pthread.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_SDL.py b/lutin/z_system/lutinSystem_Linux_SDL.py index a800d03..08bcd0b 100644 --- a/lutin/z_system/lutinSystem_Linux_SDL.py +++ b/lutin/z_system/lutinSystem_Linux_SDL.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_X11.py b/lutin/z_system/lutinSystem_Linux_X11.py index d89b918..98b361c 100644 --- a/lutin/z_system/lutinSystem_Linux_X11.py +++ b/lutin/z_system/lutinSystem_Linux_X11.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_alsa.py b/lutin/z_system/lutinSystem_Linux_alsa.py index 27b829e..c90812c 100644 --- a/lutin/z_system/lutinSystem_Linux_alsa.py +++ b/lutin/z_system/lutinSystem_Linux_alsa.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_arpa.py b/lutin/z_system/lutinSystem_Linux_arpa.py index e4f84ce..df0afba 100644 --- a/lutin/z_system/lutinSystem_Linux_arpa.py +++ b/lutin/z_system/lutinSystem_Linux_arpa.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_boost.py b/lutin/z_system/lutinSystem_Linux_boost.py index 4c8a636..4ca23b8 100644 --- a/lutin/z_system/lutinSystem_Linux_boost.py +++ b/lutin/z_system/lutinSystem_Linux_boost.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_c.py b/lutin/z_system/lutinSystem_Linux_c.py index d19f159..96833be 100644 --- a/lutin/z_system/lutinSystem_Linux_c.py +++ b/lutin/z_system/lutinSystem_Linux_c.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_cxx.py b/lutin/z_system/lutinSystem_Linux_cxx.py index e109a9d..4faf7e4 100644 --- a/lutin/z_system/lutinSystem_Linux_cxx.py +++ b/lutin/z_system/lutinSystem_Linux_cxx.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_jack.py b/lutin/z_system/lutinSystem_Linux_jack.py index b870140..febb568 100644 --- a/lutin/z_system/lutinSystem_Linux_jack.py +++ b/lutin/z_system/lutinSystem_Linux_jack.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_m.py b/lutin/z_system/lutinSystem_Linux_m.py index 28e1aae..5c5eae5 100644 --- a/lutin/z_system/lutinSystem_Linux_m.py +++ b/lutin/z_system/lutinSystem_Linux_m.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_opengl.py b/lutin/z_system/lutinSystem_Linux_opengl.py index d5cf217..40ccd68 100644 --- a/lutin/z_system/lutinSystem_Linux_opengl.py +++ b/lutin/z_system/lutinSystem_Linux_opengl.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_oss.py b/lutin/z_system/lutinSystem_Linux_oss.py index 0fdabd5..0cd7810 100644 --- a/lutin/z_system/lutinSystem_Linux_oss.py +++ b/lutin/z_system/lutinSystem_Linux_oss.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_pthread.py b/lutin/z_system/lutinSystem_Linux_pthread.py index fac50fc..92cc222 100644 --- a/lutin/z_system/lutinSystem_Linux_pthread.py +++ b/lutin/z_system/lutinSystem_Linux_pthread.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_pulse.py_ b/lutin/z_system/lutinSystem_Linux_pulse.py_ index c2b7c73..fc16aca 100644 --- a/lutin/z_system/lutinSystem_Linux_pulse.py_ +++ b/lutin/z_system/lutinSystem_Linux_pulse.py_ @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_rpc.py b/lutin/z_system/lutinSystem_Linux_rpc.py index f4c7e2c..99465a5 100644 --- a/lutin/z_system/lutinSystem_Linux_rpc.py +++ b/lutin/z_system/lutinSystem_Linux_rpc.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_uuid.py b/lutin/z_system/lutinSystem_Linux_uuid.py index 50cee06..2824476 100644 --- a/lutin/z_system/lutinSystem_Linux_uuid.py +++ b/lutin/z_system/lutinSystem_Linux_uuid.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_va.py b/lutin/z_system/lutinSystem_Linux_va.py index c9018a8..9df9061 100644 --- a/lutin/z_system/lutinSystem_Linux_va.py +++ b/lutin/z_system/lutinSystem_Linux_va.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_vdpau.py b/lutin/z_system/lutinSystem_Linux_vdpau.py index eb654a5..3d2e515 100644 --- a/lutin/z_system/lutinSystem_Linux_vdpau.py +++ b/lutin/z_system/lutinSystem_Linux_vdpau.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Linux_z.py b/lutin/z_system/lutinSystem_Linux_z.py index 0b10e5a..408114d 100644 --- a/lutin/z_system/lutinSystem_Linux_z.py +++ b/lutin/z_system/lutinSystem_Linux_z.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_AVFoundation.py b/lutin/z_system/lutinSystem_MacOs_AVFoundation.py index a2c4d66..9b61b3e 100644 --- a/lutin/z_system/lutinSystem_MacOs_AVFoundation.py +++ b/lutin/z_system/lutinSystem_MacOs_AVFoundation.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_AppKit.py b/lutin/z_system/lutinSystem_MacOs_AppKit.py index 904c80e..e42a137 100644 --- a/lutin/z_system/lutinSystem_MacOs_AppKit.py +++ b/lutin/z_system/lutinSystem_MacOs_AppKit.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_Cocoa.py b/lutin/z_system/lutinSystem_MacOs_Cocoa.py index e3d5bc0..33083f9 100644 --- a/lutin/z_system/lutinSystem_MacOs_Cocoa.py +++ b/lutin/z_system/lutinSystem_MacOs_Cocoa.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_CoreAudio.py b/lutin/z_system/lutinSystem_MacOs_CoreAudio.py index 06524ed..3c65739 100644 --- a/lutin/z_system/lutinSystem_MacOs_CoreAudio.py +++ b/lutin/z_system/lutinSystem_MacOs_CoreAudio.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_CoreGraphics.py b/lutin/z_system/lutinSystem_MacOs_CoreGraphics.py index 69167c7..e6170e2 100644 --- a/lutin/z_system/lutinSystem_MacOs_CoreGraphics.py +++ b/lutin/z_system/lutinSystem_MacOs_CoreGraphics.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_CoreMedia.py b/lutin/z_system/lutinSystem_MacOs_CoreMedia.py index fabe918..882f2aa 100644 --- a/lutin/z_system/lutinSystem_MacOs_CoreMedia.py +++ b/lutin/z_system/lutinSystem_MacOs_CoreMedia.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_CoreServices.py b/lutin/z_system/lutinSystem_MacOs_CoreServices.py index 6dfdab8..0ee8395 100644 --- a/lutin/z_system/lutinSystem_MacOs_CoreServices.py +++ b/lutin/z_system/lutinSystem_MacOs_CoreServices.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_CoreVideo.py b/lutin/z_system/lutinSystem_MacOs_CoreVideo.py index c28d18d..5433904 100644 --- a/lutin/z_system/lutinSystem_MacOs_CoreVideo.py +++ b/lutin/z_system/lutinSystem_MacOs_CoreVideo.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_Foundation.py b/lutin/z_system/lutinSystem_MacOs_Foundation.py index af6dee3..f9e88d4 100644 --- a/lutin/z_system/lutinSystem_MacOs_Foundation.py +++ b/lutin/z_system/lutinSystem_MacOs_Foundation.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_QuartzCore.py b/lutin/z_system/lutinSystem_MacOs_QuartzCore.py index 60b9aba..d36e971 100644 --- a/lutin/z_system/lutinSystem_MacOs_QuartzCore.py +++ b/lutin/z_system/lutinSystem_MacOs_QuartzCore.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_VideoDecodeAcceleration.py b/lutin/z_system/lutinSystem_MacOs_VideoDecodeAcceleration.py index c9c815f..b9e8040 100644 --- a/lutin/z_system/lutinSystem_MacOs_VideoDecodeAcceleration.py +++ b/lutin/z_system/lutinSystem_MacOs_VideoDecodeAcceleration.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_c.py b/lutin/z_system/lutinSystem_MacOs_c.py index 87a4344..84d9df7 100644 --- a/lutin/z_system/lutinSystem_MacOs_c.py +++ b/lutin/z_system/lutinSystem_MacOs_c.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_cxx.py b/lutin/z_system/lutinSystem_MacOs_cxx.py index 6ab0647..6ff03f4 100644 --- a/lutin/z_system/lutinSystem_MacOs_cxx.py +++ b/lutin/z_system/lutinSystem_MacOs_cxx.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_m.py b/lutin/z_system/lutinSystem_MacOs_m.py index b2894b9..d6319a0 100644 --- a/lutin/z_system/lutinSystem_MacOs_m.py +++ b/lutin/z_system/lutinSystem_MacOs_m.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_opengl.py b/lutin/z_system/lutinSystem_MacOs_opengl.py index cf87355..f0e2518 100644 --- a/lutin/z_system/lutinSystem_MacOs_opengl.py +++ b/lutin/z_system/lutinSystem_MacOs_opengl.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_MacOs_pthread.py b/lutin/z_system/lutinSystem_MacOs_pthread.py index 4ad5770..308bea0 100644 --- a/lutin/z_system/lutinSystem_MacOs_pthread.py +++ b/lutin/z_system/lutinSystem_MacOs_pthread.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_advapi.py b/lutin/z_system/lutinSystem_Windows_advapi.py index 62e3c59..12ca3ca 100644 --- a/lutin/z_system/lutinSystem_Windows_advapi.py +++ b/lutin/z_system/lutinSystem_Windows_advapi.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_asio.py b/lutin/z_system/lutinSystem_Windows_asio.py index 069d7ba..e12dde4 100644 --- a/lutin/z_system/lutinSystem_Windows_asio.py +++ b/lutin/z_system/lutinSystem_Windows_asio.py @@ -5,5 +5,5 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## diff --git a/lutin/z_system/lutinSystem_Windows_avicap.py b/lutin/z_system/lutinSystem_Windows_avicap.py index 143dc4b..cd1556c 100644 --- a/lutin/z_system/lutinSystem_Windows_avicap.py +++ b/lutin/z_system/lutinSystem_Windows_avicap.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_c.py b/lutin/z_system/lutinSystem_Windows_c.py index 0118adc..4dc5dcf 100644 --- a/lutin/z_system/lutinSystem_Windows_c.py +++ b/lutin/z_system/lutinSystem_Windows_c.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_cxx.py b/lutin/z_system/lutinSystem_Windows_cxx.py index d33bc84..6d02ed6 100644 --- a/lutin/z_system/lutinSystem_Windows_cxx.py +++ b/lutin/z_system/lutinSystem_Windows_cxx.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_ds.py b/lutin/z_system/lutinSystem_Windows_ds.py index 38216f1..9f2b772 100644 --- a/lutin/z_system/lutinSystem_Windows_ds.py +++ b/lutin/z_system/lutinSystem_Windows_ds.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_gdi.py b/lutin/z_system/lutinSystem_Windows_gdi.py index 5f8bb42..2cf14a9 100644 --- a/lutin/z_system/lutinSystem_Windows_gdi.py +++ b/lutin/z_system/lutinSystem_Windows_gdi.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_kernel.py b/lutin/z_system/lutinSystem_Windows_kernel.py index 8a0a477..9a5dd0f 100644 --- a/lutin/z_system/lutinSystem_Windows_kernel.py +++ b/lutin/z_system/lutinSystem_Windows_kernel.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_m.py b/lutin/z_system/lutinSystem_Windows_m.py index b2894b9..d6319a0 100644 --- a/lutin/z_system/lutinSystem_Windows_m.py +++ b/lutin/z_system/lutinSystem_Windows_m.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_ole.py b/lutin/z_system/lutinSystem_Windows_ole.py index 9324066..9abad35 100644 --- a/lutin/z_system/lutinSystem_Windows_ole.py +++ b/lutin/z_system/lutinSystem_Windows_ole.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_oleaut.py b/lutin/z_system/lutinSystem_Windows_oleaut.py index 4821c6f..51da1bd 100644 --- a/lutin/z_system/lutinSystem_Windows_oleaut.py +++ b/lutin/z_system/lutinSystem_Windows_oleaut.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_opengl.py b/lutin/z_system/lutinSystem_Windows_opengl.py index 8876f4b..2aeb296 100644 --- a/lutin/z_system/lutinSystem_Windows_opengl.py +++ b/lutin/z_system/lutinSystem_Windows_opengl.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_psapi.py b/lutin/z_system/lutinSystem_Windows_psapi.py index cb4d547..4e86fd9 100644 --- a/lutin/z_system/lutinSystem_Windows_psapi.py +++ b/lutin/z_system/lutinSystem_Windows_psapi.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_pthread.py b/lutin/z_system/lutinSystem_Windows_pthread.py index 42abd09..0b7ec60 100644 --- a/lutin/z_system/lutinSystem_Windows_pthread.py +++ b/lutin/z_system/lutinSystem_Windows_pthread.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_rpc.py b/lutin/z_system/lutinSystem_Windows_rpc.py index 616a5ec..e04e34f 100644 --- a/lutin/z_system/lutinSystem_Windows_rpc.py +++ b/lutin/z_system/lutinSystem_Windows_rpc.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_shell.py b/lutin/z_system/lutinSystem_Windows_shell.py index de88bda..3db1896 100644 --- a/lutin/z_system/lutinSystem_Windows_shell.py +++ b/lutin/z_system/lutinSystem_Windows_shell.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_shlwapi.py b/lutin/z_system/lutinSystem_Windows_shlwapi.py index 2e506bf..55bc6e8 100644 --- a/lutin/z_system/lutinSystem_Windows_shlwapi.py +++ b/lutin/z_system/lutinSystem_Windows_shlwapi.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_start-mode-gui.py b/lutin/z_system/lutinSystem_Windows_start-mode-gui.py index ac428d5..1231024 100644 --- a/lutin/z_system/lutinSystem_Windows_start-mode-gui.py +++ b/lutin/z_system/lutinSystem_Windows_start-mode-gui.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_strmiids.py b/lutin/z_system/lutinSystem_Windows_strmiids.py index b98f09e..c9cab25 100644 --- a/lutin/z_system/lutinSystem_Windows_strmiids.py +++ b/lutin/z_system/lutinSystem_Windows_strmiids.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_user.py b/lutin/z_system/lutinSystem_Windows_user.py index 4d32005..18bb77e 100644 --- a/lutin/z_system/lutinSystem_Windows_user.py +++ b/lutin/z_system/lutinSystem_Windows_user.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_uuid.py b/lutin/z_system/lutinSystem_Windows_uuid.py index d10cbde..1f37f3a 100644 --- a/lutin/z_system/lutinSystem_Windows_uuid.py +++ b/lutin/z_system/lutinSystem_Windows_uuid.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_system/lutinSystem_Windows_ws2.py b/lutin/z_system/lutinSystem_Windows_ws2.py index adc9298..c7fa4de 100644 --- a/lutin/z_system/lutinSystem_Windows_ws2.py +++ b/lutin/z_system/lutinSystem_Windows_ws2.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_target/__init__.py b/lutin/z_target/__init__.py index 069d7ba..e12dde4 100644 --- a/lutin/z_target/__init__.py +++ b/lutin/z_target/__init__.py @@ -5,5 +5,5 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## diff --git a/lutin/z_target/lutinTarget_Android.py b/lutin/z_target/lutinTarget_Android.py index 3fb7d0b..8beb216 100644 --- a/lutin/z_target/lutinTarget_Android.py +++ b/lutin/z_target/lutinTarget_Android.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_target/lutinTarget_Debian.py b/lutin/z_target/lutinTarget_Debian.py index 4cde1a2..0257f5c 100644 --- a/lutin/z_target/lutinTarget_Debian.py +++ b/lutin/z_target/lutinTarget_Debian.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_target/lutinTarget_IOs.py b/lutin/z_target/lutinTarget_IOs.py index e3a1e60..1476362 100644 --- a/lutin/z_target/lutinTarget_IOs.py +++ b/lutin/z_target/lutinTarget_IOs.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_target/lutinTarget_Linux.py b/lutin/z_target/lutinTarget_Linux.py index d644a3f..1c8aec6 100644 --- a/lutin/z_target/lutinTarget_Linux.py +++ b/lutin/z_target/lutinTarget_Linux.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_target/lutinTarget_MacOs.py b/lutin/z_target/lutinTarget_MacOs.py index fa95d48..4f5a7ed 100644 --- a/lutin/z_target/lutinTarget_MacOs.py +++ b/lutin/z_target/lutinTarget_MacOs.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_target/lutinTarget_Web.py b/lutin/z_target/lutinTarget_Web.py index df8e9aa..79ffbff 100644 --- a/lutin/z_target/lutinTarget_Web.py +++ b/lutin/z_target/lutinTarget_Web.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/z_target/lutinTarget_Windows.py b/lutin/z_target/lutinTarget_Windows.py index 0f6401c..146f5c2 100644 --- a/lutin/z_target/lutinTarget_Windows.py +++ b/lutin/z_target/lutinTarget_Windows.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from lutin import debug diff --git a/lutin/zip.py b/lutin/zip.py index 3ad2ceb..7ee50a7 100644 --- a/lutin/zip.py +++ b/lutin/zip.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## import platform diff --git a/setup.py b/setup.py index d8202a3..ad4dc91 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ ## ## @copyright 2012, Edouard DUPIN, all right reserved ## -## @license APACHE v2.0 (see license file) +## @license MPL v2.0 (see license file) ## from setuptools import setup @@ -22,14 +22,14 @@ setup(name='lutin', url='http://github.com/HeeroYui/lutin', author='Edouard DUPIN', author_email='yui.heero@gmail.com', - license='APACHE-2', + license='MPL-2', packages=['lutin', 'lutin/z_builder', 'lutin/z_system', 'lutin/z_target'], classifiers=[ - 'Development Status :: 4 - Beta', - 'License :: OSI Approved :: Apache Software License', + 'Development Status :: 5 - Beta', + 'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)', 'Programming Language :: Python', 'Topic :: Software Development :: Compilers', ],