summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-08-24 13:18:15 +0000
committerintrigeri <intrigeri@boum.org>2016-08-24 13:18:15 +0000
commit2aeedecc49036bfc5aec9ba713823c9c57ae8f0e (patch)
treeaba6c0995e99dac6f243cde1d9fb329c41474e8f
parent04444dbf3fa20111b5a585ac793941f453f61635 (diff)
parent61e9399624252c25481983b8c5c6a3447fa0f270 (diff)
Merge remote-tracking branch 'origin/feature/stretch' into feature/stretch
-rw-r--r--config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults4
-rw-r--r--features/domains/default.xml2
2 files changed, 1 insertions, 5 deletions
diff --git a/config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults b/config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults
index d8a976c..6536d5f 100644
--- a/config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults
+++ b/config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults
@@ -80,10 +80,6 @@ critical-battery-action = 'shutdown'
lid-close-ac-action = 'blank'
lid-close-battery-action = 'blank'
-[org/gnome/settings-daemon/plugins/xsettings]
-antialiasing = 'rgba'
-hinting = 'slight'
-
[org/gnome/shell]
enabled-extensions = ['apps-menu@gnome-shell-extensions.gcampax.github.com', 'window-list@gnome-shell-extensions.gcampax.github.com', 'TopIcons@phocean.net', 'shutdown-helper@tails.boum.org', 'torstatus@tails.boum.org']
favorite-apps=['tor-browser.desktop', 'icedove.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
diff --git a/features/domains/default.xml b/features/domains/default.xml
index 1066246..303c728 100644
--- a/features/domains/default.xml
+++ b/features/domains/default.xml
@@ -46,7 +46,7 @@
</graphics>
<sound model='ich6'/>
<video>
- <model type='vga' vram='131072' heads='1' primary='yes'/>
+ <model type='qxl' ram='65536' vram='131072' vgamem='16384' heads='1'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'/>