summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Nicolas <ennael@mageia.org>2016-03-24 20:47:21 +0100
committerAnne Nicolas <ennael@mageia.org>2016-03-24 20:47:21 +0100
commit8e01b78f3b2b6dbbafad6d33b682549bd188e4e7 (patch)
tree1e3cf557c163e314c62c42f323e992ba91ea5192
parent0e9cacf11b597e18739debc5056dffdf2d8cc7a3 (diff)
parentbc28a36ca34710bb2a6f246d0ad285b7a0db77c0 (diff)
downloaddrakx-kbd-mouse-x11-8e01b78f3b2b6dbbafad6d33b682549bd188e4e7.tar
drakx-kbd-mouse-x11-8e01b78f3b2b6dbbafad6d33b682549bd188e4e7.tar.gz
drakx-kbd-mouse-x11-8e01b78f3b2b6dbbafad6d33b682549bd188e4e7.tar.bz2
drakx-kbd-mouse-x11-8e01b78f3b2b6dbbafad6d33b682549bd188e4e7.tar.xz
drakx-kbd-mouse-x11-8e01b78f3b2b6dbbafad6d33b682549bd188e4e7.zip
Merge branch 'user/animtim/designWork'
-rw-r--r--.gitignore2
-rw-r--r--data/pixmaps/arrow_down.pngbin257 -> 184 bytes
-rw-r--r--data/pixmaps/arrow_up.pngbin255 -> 189 bytes
-rw-r--r--data/pixmaps/monitor-1024.pngbin16211 -> 1733 bytes
-rw-r--r--data/pixmaps/monitor-1152.pngbin16211 -> 1733 bytes
-rw-r--r--data/pixmaps/monitor-1280.pngbin16211 -> 1733 bytes
-rw-r--r--data/pixmaps/monitor-1400.pngbin16211 -> 1733 bytes
-rw-r--r--data/pixmaps/monitor-1600.pngbin16211 -> 1733 bytes
-rw-r--r--data/pixmaps/monitor-1920.pngbin16211 -> 1733 bytes
-rw-r--r--data/pixmaps/monitor-2048.pngbin16211 -> 1733 bytes
-rw-r--r--data/pixmaps/monitor-640.pngbin16211 -> 1733 bytes
-rw-r--r--data/pixmaps/monitor-800.pngbin16211 -> 1733 bytes
-rw-r--r--data/pixmaps/monitor.pngbin16211 -> 1733 bytes
13 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ef5c6d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.directory
+
diff --git a/data/pixmaps/arrow_down.png b/data/pixmaps/arrow_down.png
index fff49ff..4283fcf 100644
--- a/data/pixmaps/arrow_down.png
+++ b/data/pixmaps/arrow_down.png
Binary files differ
diff --git a/data/pixmaps/arrow_up.png b/data/pixmaps/arrow_up.png
index ba28283..ec3cadd 100644
--- a/data/pixmaps/arrow_up.png
+++ b/data/pixmaps/arrow_up.png
Binary files differ
diff --git a/data/pixmaps/monitor-1024.png b/data/pixmaps/monitor-1024.png
index f7dff04..b8206ce 100644
--- a/data/pixmaps/monitor-1024.png
+++ b/data/pixmaps/monitor-1024.png
Binary files differ
diff --git a/data/pixmaps/monitor-1152.png b/data/pixmaps/monitor-1152.png
index f7dff04..b8206ce 100644
--- a/data/pixmaps/monitor-1152.png
+++ b/data/pixmaps/monitor-1152.png
Binary files differ
diff --git a/data/pixmaps/monitor-1280.png b/data/pixmaps/monitor-1280.png
index f7dff04..b8206ce 100644
--- a/data/pixmaps/monitor-1280.png
+++ b/data/pixmaps/monitor-1280.png
Binary files differ
diff --git a/data/pixmaps/monitor-1400.png b/data/pixmaps/monitor-1400.png
index f7dff04..b8206ce 100644
--- a/data/pixmaps/monitor-1400.png
+++ b/data/pixmaps/monitor-1400.png
Binary files differ
diff --git a/data/pixmaps/monitor-1600.png b/data/pixmaps/monitor-1600.png
index f7dff04..b8206ce 100644
--- a/data/pixmaps/monitor-1600.png
+++ b/data/pixmaps/monitor-1600.png
Binary files differ
diff --git a/data/pixmaps/monitor-1920.png b/data/pixmaps/monitor-1920.png
index f7dff04..b8206ce 100644
--- a/data/pixmaps/monitor-1920.png
+++ b/data/pixmaps/monitor-1920.png
Binary files differ
diff --git a/data/pixmaps/monitor-2048.png b/data/pixmaps/monitor-2048.png
index f7dff04..b8206ce 100644
--- a/data/pixmaps/monitor-2048.png
+++ b/data/pixmaps/monitor-2048.png
Binary files differ
diff --git a/data/pixmaps/monitor-640.png b/data/pixmaps/monitor-640.png
index f7dff04..b8206ce 100644
--- a/data/pixmaps/monitor-640.png
+++ b/data/pixmaps/monitor-640.png
Binary files differ
diff --git a/data/pixmaps/monitor-800.png b/data/pixmaps/monitor-800.png
index f7dff04..b8206ce 100644
--- a/data/pixmaps/monitor-800.png
+++ b/data/pixmaps/monitor-800.png
Binary files differ
diff --git a/data/pixmaps/monitor.png b/data/pixmaps/monitor.png
index f7dff04..b8206ce 100644
--- a/data/pixmaps/monitor.png
+++ b/data/pixmaps/monitor.png
Binary files differ