summaryrefslogtreecommitdiff
path: root/design-data
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2014-11-23 13:08:59 -0500
committerAllen Winter <allen.winter@kdab.com>2014-11-23 13:08:59 -0500
commit8ab12cf2b0c40fe8096871bf43a07300e625fa78 (patch)
tree38d2b2f09145544336314860fb6a42c825ebaf4b /design-data
parent59ba4bfca47d50e94f6128a909f021722dd3f870 (diff)
parent32b193852e578da6e16922a7d50154fe7438b226 (diff)
downloadlibical-git-8ab12cf2b0c40fe8096871bf43a07300e625fa78.tar.gz
Merge branch 'master' into coverity_scan
Diffstat (limited to 'design-data')
-rwxr-xr-x[-rw-r--r--]design-data/parameters.csv0
-rwxr-xr-x[-rw-r--r--]design-data/params-in-prop.txt0
2 files changed, 0 insertions, 0 deletions
diff --git a/design-data/parameters.csv b/design-data/parameters.csv
index 1a03eb00..1a03eb00 100644..100755
--- a/design-data/parameters.csv
+++ b/design-data/parameters.csv
diff --git a/design-data/params-in-prop.txt b/design-data/params-in-prop.txt
index 2a803218..2a803218 100644..100755
--- a/design-data/params-in-prop.txt
+++ b/design-data/params-in-prop.txt