diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 23:10:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 23:10:18 +0200 |
| commit | b231d9f41903f8514a2d91844f4515055307af3a (patch) | |
| tree | 81d0f895ecb58b7c5de676ca09211c179862750d /examples/svg/embedded | |
| parent | 612c3041475550837dee7149b9f5e9e4f55c17a0 (diff) | |
| parent | 0eeaceca600ce63711387d4e3375c7a50239802d (diff) | |
| download | qtsvg-b231d9f41903f8514a2d91844f4515055307af3a.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
.qmake.conf
Change-Id: I55408b98072be007247bca4fa61f1a62ce32e7ca
Diffstat (limited to 'examples/svg/embedded')
| -rw-r--r-- | examples/svg/embedded/fluidlauncher/backup_registration.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/examples/svg/embedded/fluidlauncher/backup_registration.xml b/examples/svg/embedded/fluidlauncher/backup_registration.xml deleted file mode 100644 index 794e11d..0000000 --- a/examples/svg/embedded/fluidlauncher/backup_registration.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" standalone="yes"?> -<backup_registration> - <passive_backup> - <include_directory name = "\" /> - </passive_backup> - <system_backup/> - <restore requires_reboot = "no"/> -</backup_registration> |