summaryrefslogtreecommitdiffstats
path: root/tools/checklicenses
diff options
context:
space:
mode:
authormichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 00:05:45 +0000
committermichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 00:05:45 +0000
commit7f4db91fc8b0a96c65d35b092ac9cee613f3bda7 (patch)
treeef55050d004db733fb72cb0fd9e9fcd94ffada49 /tools/checklicenses
parentcf47ab64dd2650b11409efad057e4bd7a31318fb (diff)
downloadchromium_src-7f4db91fc8b0a96c65d35b092ac9cee613f3bda7.zip
chromium_src-7f4db91fc8b0a96c65d35b092ac9cee613f3bda7.tar.gz
chromium_src-7f4db91fc8b0a96c65d35b092ac9cee613f3bda7.tar.bz2
Make the license tools recoginze the dual license
BUG=98116 TEST= Review URL: http://codereview.chromium.org/8094004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/checklicenses')
-rwxr-xr-xtools/checklicenses/checklicenses.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index a77c86b..3bc17e5 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -32,6 +32,7 @@ Examples:
WHITELISTED_LICENSES = [
'Apache (v2.0)',
'Apache (v2.0) BSD (2 clause)',
+ 'Apache (v2.0) GPL (v2)',
'BSD',
'BSD (2 clause)',
'BSD (2 clause) MIT/X11 (BSD like)',