Conflicts: dom0/qvm-core/qubes.py dom0/qvm-tools/qvm-prefs dom0/qvm-tools/qvm-template-commit |
||
|---|---|---|
| .. | ||
| aux-tools | ||
| clipboard_notifier | ||
| icons | ||
| init.d | ||
| pendrive_swapper | ||
| pm-utils | ||
| qmemman | ||
| qvm-core | ||
| qvm-tools | ||
| restore | ||
| qubes.repo | ||
Conflicts: dom0/qvm-core/qubes.py dom0/qvm-tools/qvm-prefs dom0/qvm-tools/qvm-template-commit |
||
|---|---|---|
| .. | ||
| aux-tools | ||
| clipboard_notifier | ||
| icons | ||
| init.d | ||
| pendrive_swapper | ||
| pm-utils | ||
| qmemman | ||
| qvm-core | ||
| qvm-tools | ||
| restore | ||
| qubes.repo | ||