diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2017-03-15 20:33:49 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2017-03-15 20:33:49 +0100 |
| commit | ce5d484c41a20f269c2eda713423660efee509b9 (patch) | |
| tree | ad643dc94412181c212bd94b1dcd9f33dc841031 /res/images | |
| parent | 24a6149446658d9f6d7345f36eb5727558b72f45 (diff) | |
| parent | 5011ae69dbe867c276590a8e40b1d7afdfb772f5 (diff) | |
Merge commit '5011ae69dbe867c276590a8e40b1d7afdfb772f5' into lv2_support2
Conflicts:
src/mixxx.cpp
Diffstat (limited to 'res/images')
| -rw-r--r-- | res/images/mixxx-icon-logo-symbolic.png | bin | 0 -> 7484 bytes |
| -rw-r--r-- | res/images/mixxx-icon-symbolic.png | bin | 0 -> 797 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/res/images/mixxx-icon-logo-symbolic.png b/res/images/mixxx-icon-logo-symbolic.png Binary files differnew file mode 100644 index 0000000000..549d283773 --- /dev/null +++ b/res/images/mixxx-icon-logo-symbolic.png diff --git a/res/images/mixxx-icon-symbolic.png b/res/images/mixxx-icon-symbolic.png Binary files differnew file mode 100644 index 0000000000..1c63eb4d35 --- /dev/null +++ b/res/images/mixxx-icon-symbolic.png |
