Merge remote-tracking branch 'origin/master' into cgen
This commit is contained in:
commit
87fb7f46e9
2 changed files with 7 additions and 3 deletions
|
|
@ -815,6 +815,9 @@ insert into archivetypes (name, description, extensions) values ('vhd', 'Hyper-V
|
|||
insert into archivetypes (name, description, extensions) values ('wsf', 'Windows script file', 'wsf');
|
||||
insert into archivetypes (name, description, extensions) values ('box', 'Vagrant Box Image', 'box');
|
||||
insert into archivetypes (name, description, extensions) values ('raw-xz', 'xz compressed raw disk image', 'raw.xz');
|
||||
insert into archivetypes (name, description, extensions) values ('json', 'JSON data', 'json');
|
||||
insert into archivetypes (name, description, extensions) values ('key', 'Key file', 'key');
|
||||
insert into archivetypes (name, description, extensions) values ('dot', 'DOT graph description', 'dot gv');
|
||||
|
||||
|
||||
-- Do we want to enforce a constraint that a build can only generate one
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue