summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--LICENSE5
-rw-r--r--tcg/LICENSE3
2 files changed, 3 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 9389ba614f..f19b018486 100644
--- a/LICENSE
+++ b/LICENSE
@@ -18,8 +18,9 @@ As of July 2013, contributions under version 2 of the GNU General Public
License (and no later version) are only accepted for the following files
or directories: bsd-user/, linux-user/, hw/vfio/, hw/xen/xen_pt*.
-3) The Tiny Code Generator (TCG) is released under the BSD license
- (see license headers in files).
+3) The Tiny Code Generator (TCG) is mostly under the BSD or MIT licenses;
+ but some parts may be GPLv2 or other licenses. Again, see the
+ specific licensing information in each source file.
4) QEMU is a trademark of Fabrice Bellard.
diff --git a/tcg/LICENSE b/tcg/LICENSE
deleted file mode 100644
index be817fa162..0000000000
--- a/tcg/LICENSE
+++ /dev/null
@@ -1,3 +0,0 @@
-All the files in this directory and subdirectories are released under
-a BSD like license (see header in each file). No other license is
-accepted.