Merge remote-tracking branch 'spice/spice.v37' into staging (ac779fe2) · Commits · Anton / libtcg · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

libtcg
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

ac779fe2

Commit ac779fe2 authored 13 years ago by Anthony Liguori

Downloads
- Plain Diff

Merge remote-tracking branch 'spice/spice.v37' into staging

Conflicts:
	vl.c

parents 13748cf4 212496c9

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

configure 1 addition, 1 deletion

configure
hw/qxl.c 3 additions, 1 deletion

hw/qxl.c
qemu-config.c 9 additions, 3 deletions

qemu-config.c
qemu-options.hx 16 additions, 0 deletions

qemu-options.hx
spice-qemu-char.c 5 additions, 6 deletions

spice-qemu-char.c
ui/spice-core.c 18 additions, 8 deletions

ui/spice-core.c
vl.c 1 addition, 0 deletions

vl.c

with 53 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment