Merge branch 'develop' of https://github.com/DreamSourceLab/DSView into develop

17c20781 · DreamSourceLab · 13dd644f · 01e1c8af · 13dd644f · 17c20781
Commit 17c20781 authored 9 years ago by DreamSourceLab
20 changed files
--- a/DSView/icons/about.png
+++ b/DSView/icons/about.png
--- a/DSView/icons/add.png
+++ b/DSView/icons/add.png
--- a/DSView/icons/capture.png
+++ b/DSView/icons/capture.png
--- a/DSView/icons/decoder-hidden.png
+++ b/DSView/icons/decoder-hidden.png
--- a/DSView/icons/decoder-shown.png
+++ b/DSView/icons/decoder-shown.png
--- a/DSView/icons/del.png
+++ b/DSView/icons/del.png
--- a/DSView/icons/down-arrow.png
+++ b/DSView/icons/down-arrow.png
--- a/DSView/icons/dsl_logo.png
+++ b/DSView/icons/dsl_logo.png
--- a/DSView/icons/file.png
+++ b/DSView/icons/file.png
--- a/DSView/icons/file_dis.png
+++ b/DSView/icons/file_dis.png
--- a/DSView/icons/gear.png
+++ b/DSView/icons/gear.png
--- a/DSView/icons/instant.png
+++ b/DSView/icons/instant.png
--- a/DSView/icons/logo.png
+++ b/DSView/icons/logo.png
--- a/DSView/icons/logo_color.png
+++ b/DSView/icons/logo_color.png
--- a/DSView/icons/logo_noColor.png
+++ b/DSView/icons/logo_noColor.png
--- a/DSView/icons/measure.png
+++ b/DSView/icons/measure.png
--- a/DSView/icons/measure_dis.png
+++ b/DSView/icons/measure_dis.png
--- a/DSView/icons/next.png
+++ b/DSView/icons/next.png
--- a/DSView/icons/open.png
+++ b/DSView/icons/open.png
--- a/DSView/icons/params.png
+++ b/DSView/icons/params.png