summaryrefslogtreecommitdiffstats
path: root/res/images
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2017-03-15 20:56:10 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2017-03-16 20:56:10 +0100
commita70d60c953b818afea22c7443af56aded5be9ca4 (patch)
tree9f7e499fad5d1c21e47726baeb15ae39e92e0e63 /res/images
parentd6d9d53193ad2629b0c10985f52ae6f108f16499 (diff)
parent3eb8844a5e5a789395cd0d72b45040c38521697d (diff)
Merge remote-tracking branch 'upstream/master' into lv2_support2
Diffstat (limited to 'res/images')
-rw-r--r--res/images/library/cross.pngbin0 -> 471 bytes
-rw-r--r--res/images/library/ic_library_browse.pngbin1683 -> 0 bytes
-rw-r--r--res/images/library/ic_library_computer.pngbin0 -> 1182 bytes
-rw-r--r--res/images/library/ic_library_itunes.pngbin1448 -> 2652 bytes
-rw-r--r--res/images/library/ic_library_library.pngbin1202 -> 0 bytes
-rw-r--r--res/images/library/ic_library_tracks.pngbin0 -> 1313 bytes
-rw-r--r--res/images/library/ic_library_traktor.pngbin2213 -> 2991 bytes
-rw-r--r--res/images/preferences/ic_preferences_interface.pngbin1130 -> 2534 bytes
8 files changed, 0 insertions, 0 deletions
diff --git a/res/images/library/cross.png b/res/images/library/cross.png
new file mode 100644
index 0000000000..7cdc6e3378
--- /dev/null
+++ b/res/images/library/cross.png
Binary files differ
diff --git a/res/images/library/ic_library_browse.png b/res/images/library/ic_library_browse.png
deleted file mode 100644
index 46dc47e085..0000000000
--- a/res/images/library/ic_library_browse.png
+++ /dev/null
Binary files differ
diff --git a/res/images/library/ic_library_computer.png b/res/images/library/ic_library_computer.png
new file mode 100644
index 0000000000..8a5b9fa5c7
--- /dev/null
+++ b/res/images/library/ic_library_computer.png
Binary files differ
diff --git a/res/images/library/ic_library_itunes.png b/res/images/library/ic_library_itunes.png
index 744b497860..09350d077e 100644
--- a/res/images/library/ic_library_itunes.png
+++ b/res/images/library/ic_library_itunes.png
Binary files differ
diff --git a/res/images/library/ic_library_library.png b/res/images/library/ic_library_library.png
deleted file mode 100644
index 8a9d73f85d..0000000000
--- a/res/images/library/ic_library_library.png
+++ /dev/null
Binary files differ
diff --git a/res/images/library/ic_library_tracks.png b/res/images/library/ic_library_tracks.png
new file mode 100644
index 0000000000..7aefc03aab
--- /dev/null
+++ b/res/images/library/ic_library_tracks.png
Binary files differ
diff --git a/res/images/library/ic_library_traktor.png b/res/images/library/ic_library_traktor.png
index 5cab244c0a..a1b30198df 100644
--- a/res/images/library/ic_library_traktor.png
+++ b/res/images/library/ic_library_traktor.png
Binary files differ
diff --git a/res/images/preferences/ic_preferences_interface.png b/res/images/preferences/ic_preferences_interface.png
index c374f39e80..dee22600f5 100644
--- a/res/images/preferences/ic_preferences_interface.png
+++ b/res/images/preferences/ic_preferences_interface.png
Binary files differ