diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-10 15:34:10 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-10 16:28:06 +0100 |
| commit | 726e1a49bd40d98ffcfba760a08c503b096c79bd (patch) | |
| tree | 67c14fe293003ce59a391c1d70c6965341d6bfc4 /svgio/qa | |
| parent | e639c4e2a43d4378af263f062b3ca06af8ed8c15 (diff) | |
wrong merge conflict resolution, vcldemo, icontest go to instdir
Change-Id: Iefcca922fc824877c49a11cd68023d57eff22d2f
Diffstat (limited to 'svgio/qa')
0 files changed, 0 insertions, 0 deletions