Skip to content

Commit

Permalink
Fixed license name and content
Browse files Browse the repository at this point in the history
  • Loading branch information
Shuge Lee committed Apr 27, 2012
1 parent 245c60d commit 5ecbb15
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 30 deletions.
24 changes: 24 additions & 0 deletions LICENSE
@@ -0,0 +1,24 @@
Copyright (c) <2012>, <shuge.lee@gmail.com>
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Shuge Lab. nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL shuge.lee@gmail.com BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 changes: 0 additions & 26 deletions LICENSE.txt

This file was deleted.

11 changes: 7 additions & 4 deletions LICENSE_zh_CN.txt
@@ -1,6 +1,9 @@
郑重声明
郑重声明

本项目之所有内容(包括但不限于字母、汉字、拼音、图片、影像等)完全是复制粘贴,其内容来源于国际互联网,本人并不明白其全部或部分之意思
本项目之所有内容(包括但不限于字母、汉字、拼音、图片、影像等)完全是复
制粘贴,其内容来源于国际互联网,本人并不明白其全部或部分之意思
(包括但不限于对所复制粘贴之内容的识别、阅读、理解、分析、记忆等),
故本人不对以上及本内容负任何法律责任(包括但不限于刑事、民事责任)及其他潜在责任与义务(包括但不限于相关国家已存在、正在形成、
未来将形成之的法律法规之责任),请不要跨省追捕。 要详查请亲自直接联系原作者。
故本人不对以上及本内容负任何法律责任(包括但不限于刑事、民事责任)
及其他潜在责任与义务(包括但不限于相关国家已存在、正在形成、未来将形成
之的法律法规之责任),请不要跨省追捕。 要详查请亲自直接联系原作者。

4 changes: 4 additions & 0 deletions README.md → README
@@ -1,5 +1,9 @@
# Resources About Qt GUI Framework Python Binding

Lots of simple and Pythonic PySide demos,
this project is released under the permissive 3-clause BSD license.


Qt FEATURES, you should read these first of all

- [Qt and Key Technologies](http://doc.qt.nokia.com/latest/technology-apis.html)
Expand Down

0 comments on commit 5ecbb15

Please sign in to comment.