Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / LICENSE

diff --git a/LICENSE b/LICENSE
index b403f41..cbd92c0 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,26 +1,18 @@
-The following points clarify the QEMU licenses:
+The following points clarify the QEMU license:
 
-1) The QEMU virtual CPU core library (libqemu.a) and the QEMU PC
-   system emulator are released under the GNU Lesser General Public
-   License.
+1) QEMU as a whole is released under the GNU General Public License
 
-2) The Linux user mode QEMU emulator is released under the GNU General
-   Public License.
+2) Parts of QEMU have specific licenses which are compatible with the
+GNU General Public License. Hence each source file contains its own
+licensing information.
 
-3) The QEMU Accelerator Module is a proprietary product. It is
-   available without charge. Commercial use of the QEMU Accelerator
-   Module is allowed.
-   
-   Redistribution of the QEMU Accelerator Module: any person or
-   organisation wishing to distribute it, for example on a CD or as a
-   binary or source package, must have an explicit authorization from
-   the author.
+In particular, the QEMU virtual CPU core library (libqemu.a) is
+released under the GNU Lesser General Public License. Many hardware
+device emulation sources are released under the BSD license.
 
-   The QEMU Accelerator Module is available without any express or
-   implied warranty. In no event will the author be held liable for
-   any damages arising from the use of this software.
+3) The Tiny Code Generator (TCG) is released under the BSD license
+   (see license headers in files).
 
 4) QEMU is a trademark of Fabrice Bellard.
 
-
-Fabrice Bellard.
\ No newline at end of file
+Fabrice Bellard.