Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into hvm

Browse Source 
Conflicts:
	version_dom0
This commit is contained in:
Marek Marczykowski 2012-08-01 00:55:05 +02:00
commit cfbc18574d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpm_spec/core-vm-kernel-placeholder.spec
View File

@ -10,6 +10,12 @@ Vendor: Invisible Things Lab
License: GPL
Group: Qubes
URL: http://www.qubes-os.org
# template released with 1.0-rc1 have kernel-debug installed by mistake. This
# line is required to smooth upgrade.
Obsoletes: kernel-debug
# this driver require exact kernel-drm-nouveau version; as isn't needed in VM,
# just remove it
Obsoletes: xorg-x11-drv-nouveau
# choose the oldest Qubes-supported VM kernel
Provides: kernel = 3.2.7

2
version_vm
View File

@ -1 +1 @@
1.7.36
1.7.42