diff options
| author | Matěj Cepl <mcepl@redhat.com> | 2011-07-19 14:30:39 +0200 |
|---|---|---|
| committer | Matěj Cepl <mcepl@redhat.com> | 2011-07-19 15:22:49 +0200 |
| commit | d75f36db36c442ae9621dc128fbd916c25d5735f (patch) | |
| tree | c9ed3fcd6f86d28a9434b95e5060f3f64be17917 /chip-data | |
| parent | e06a2341056cabd82fae8527d30a9ec97b24dc10 (diff) | |
| parent | 4ef203c974e889b74e4064ee04eddc55ba7b8c08 (diff) | |
| download | bugzilla-triage-d75f36db36c442ae9621dc128fbd916c25d5735f.tar.gz | |
Merge branch 'bugzillatweaks' into next.
This is a horribly botched branch merged.
Conflicts:
chip-data/chipNames.json
data/lib/bugzillaDOMFunctions.js
data/lib/bzpage.js
data/lib/jumpNextBug.js
data/lib/otherButtons.js
data/lib/queries.js
data/lib/util.js
data/rhlib/addAttachmentRow.js
data/rhlib/fixingAttMIME.js
data/rhlib/rhbzpage.js
data/tweaks/bug-page-mod.js
data/tweaks/viewSource.js
lib/libbugzilla.js
lib/main.js
package.json
Diffstat (limited to 'chip-data')
| -rw-r--r-- | chip-data/chipNames.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chip-data/chipNames.json b/chip-data/chipNames.json index b0d2b22..ded57d2 100644 --- a/chip-data/chipNames.json +++ b/chip-data/chipNames.json @@ -560,5 +560,6 @@ "8086:010A":["Sandybridge"], "15AD:0405":["VMware_SVGA_II"], "1013:00B8":["GD5446_KVM"], + "1b36:0100":["RH_QXL_2"], "102B:051B":["Millennium_II"] } |