summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-03-04 13:41:52 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-03-04 13:44:29 +0100
commit8ac63a3323585de28428df3f376bdf3f3c2a67fb (patch)
treed0c4f9f0d48864ca5439bba3186485df48d0d165 /doc
parent59f168c5e5eec7ac247e6154a65f85a7ccc6e7ad (diff)
parent88550543f8b4b7c76bffeebb923ad1f72b774b6e (diff)
Merge remote-tracking branch 'origin/5.4' into 5.5
Diffstat (limited to 'doc')
-rw-r--r--[-rwxr-xr-x]doc/global/template/style/icomoon.eotbin4624 -> 4624 bytes
-rw-r--r--[-rwxr-xr-x]doc/global/template/style/icomoon.svg0
-rw-r--r--[-rwxr-xr-x]doc/global/template/style/icomoon.ttfbin4460 -> 4460 bytes
-rw-r--r--[-rwxr-xr-x]doc/global/template/style/icomoon.woffbin4536 -> 4536 bytes
4 files changed, 0 insertions, 0 deletions
diff --git a/doc/global/template/style/icomoon.eot b/doc/global/template/style/icomoon.eot
index 68f0fa6ae6..68f0fa6ae6 100755..100644
--- a/doc/global/template/style/icomoon.eot
+++ b/doc/global/template/style/icomoon.eot
Binary files differ
diff --git a/doc/global/template/style/icomoon.svg b/doc/global/template/style/icomoon.svg
index 3246f83769..3246f83769 100755..100644
--- a/doc/global/template/style/icomoon.svg
+++ b/doc/global/template/style/icomoon.svg
diff --git a/doc/global/template/style/icomoon.ttf b/doc/global/template/style/icomoon.ttf
index 4518527c8b..4518527c8b 100755..100644
--- a/doc/global/template/style/icomoon.ttf
+++ b/doc/global/template/style/icomoon.ttf
Binary files differ
diff --git a/doc/global/template/style/icomoon.woff b/doc/global/template/style/icomoon.woff
index 5c8466c40f..5c8466c40f 100755..100644
--- a/doc/global/template/style/icomoon.woff
+++ b/doc/global/template/style/icomoon.woff
Binary files differ