Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,484 Commits 1 Branch 0 Tags 15 MiB
Python 97.8%
Shell 1.7%
Makefile 0.5%
9eafa57539
Go to file
Wojtek Porczyk 9eafa57539 Merge remote-tracking branch 'marmarek/master' into core3-devel 
The following list is bollocks. There were many, many more.

Conflicts:
    core-modules/003QubesTemplateVm.py
    core-modules/005QubesNetVm.py
    core/qubes.py
    core/storage/__init__.py
    core/storage/xen.py
    doc/qvm-tools/qvm-pci.rst
    doc/qvm-tools/qvm-prefs.rst
    qubes/tools/qmemmand.py
    qvm-tools/qvm-create
    qvm-tools/qvm-prefs
    qvm-tools/qvm-start
    tests/__init__.py
    vm-config/xen-vm-template-hvm.xml

This commit took 2 days (26-27.01.2016) and put our friendship to test.
    --Wojtek and Marek
2016-03-03 01:13:51 +01:00
core Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
core-modules Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
dispvm dispvm: cleanup DispVM even if was already destroyed 2016-01-20 02:50:47 +01:00
doc Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
etc Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
linux Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
qubes Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
qubes-rpc typo 2015-10-21 20:57:30 +00:00
qubes-rpc-policy qubes-rpc-policy/qubes.GetImageRGBA.policy 2014-05-20 17:49:20 +02:00
qvm-tools Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
relaxng rpm: install RelaxNG specfiles 2015-06-29 17:39:26 +02:00
rpm_spec Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
site-packages add convenient symlinks simulating target python files layout 2014-03-10 01:05:01 +01:00
site-packages-qmemman Convenient link for qmemman 2014-04-23 12:53:41 +02:00
tests Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
vm-config Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
.coveragerc add config for coverage.py 2015-10-12 16:40:46 +02:00
.gitignore add config for coverage.py 2015-10-12 16:40:46 +02:00
.pylintrc qubes/tests/int/tools/qvm_run: add tests for qvm-run 2015-12-29 03:50:35 +01:00
installer.wxs windows/installer: configurable destination directory 2014-11-19 12:50:31 +01:00
LICENSE Added LICENSE 2010-04-05 21:21:27 +02:00
Makefile Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
Makefile.builder windows: installer 2014-11-19 12:50:30 +01:00
README.md Add README.md with warning 2015-10-05 12:46:14 +02:00
setup.py install python package with setuptools 2015-10-05 12:46:14 +02:00
version version 3.1.11 2016-01-15 17:35:25 +01:00

README.md

Qubes core, version 3

This is development branch of the Qubes OS core. This branch is subject to rebase without warning until further notice.

API documentation is available: https://ftp.qubes-os.org/~woju/core3doc/.