summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-18 20:30:58 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-18 20:30:58 +0100
commitc1dfb19a89a2f191bece906051477e12f3713512 (patch)
tree761aa11bd69e5ca1a7ef8edfd8d81478e6bafdfe /app/assets
parent48ff1a850df34ecc40e71882e2c7872211c353e4 (diff)
parent022f8458e18c7091e1e1dd25bf53f78867354757 (diff)
Merge branch 'develop'
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/icons/cellphone-32x.pngbin1938 -> 0 bytes
-rw-r--r--app/assets/icons/clock-32x.pngbin5968 -> 0 bytes
-rw-r--r--app/assets/icons/cross-16x.pngbin3350 -> 0 bytes
-rw-r--r--app/assets/icons/facebook-32x.pngbin402 -> 0 bytes
-rw-r--r--app/assets/icons/fax-32x.pngbin5762 -> 0 bytes
-rw-r--r--app/assets/icons/headphones-16x.pngbin3285 -> 0 bytes
-rw-r--r--app/assets/icons/headphones-32x.pngbin5906 -> 0 bytes
-rw-r--r--app/assets/icons/house-32x.pngbin5741 -> 0 bytes
-rw-r--r--app/assets/icons/mic-32x.pngbin5837 -> 0 bytes
-rw-r--r--app/assets/icons/microphone-16x.pngbin3239 -> 0 bytes
-rw-r--r--app/assets/icons/microphone-32x.pngbin5837 -> 0 bytes
-rw-r--r--app/assets/icons/mute-16x.pngbin3349 -> 0 bytes
-rw-r--r--app/assets/icons/phone-down-32x.pngbin5879 -> 0 bytes
-rw-r--r--app/assets/icons/phone-mobile-32x.pngbin5509 -> 0 bytes
-rw-r--r--app/assets/icons/phone-up-32x.pngbin5861 -> 0 bytes
-rw-r--r--app/assets/icons/search-13x16.pngbin849 -> 0 bytes
-rw-r--r--app/assets/icons/skype-32x.pngbin625 -> 0 bytes
-rw-r--r--app/assets/icons/star-16x.pngbin3379 -> 0 bytes
-rw-r--r--app/assets/icons/suitcase-32x.pngbin5550 -> 0 bytes
-rw-r--r--app/assets/icons/tag-16x.pngbin3286 -> 0 bytes
-rw-r--r--app/assets/icons/twitter-32x.pngbin397 -> 0 bytes
-rw-r--r--app/assets/icons/unmute-16x.pngbin3373 -> 0 bytes
-rw-r--r--app/assets/icons/user-16x.pngbin3287 -> 0 bytes
-rw-r--r--app/assets/icons/user-female-16x.pngbin1680 -> 0 bytes
-rw-r--r--app/assets/icons/user-male-16x.pngbin1559 -> 0 bytes
-rw-r--r--app/assets/images/icons/gs_envelope_16x.png (renamed from app/assets/icons/gs_envelope_16x.png)bin371 -> 371 bytes
-rw-r--r--app/assets/images/icons/gs_forward_16x.png (renamed from app/assets/icons/gs_forward_16x.png)bin301 -> 301 bytes
-rw-r--r--app/assets/images/icons/gs_missed_16x.png (renamed from app/assets/icons/gs_missed_16x.png)bin354 -> 354 bytes
-rw-r--r--app/assets/images/icons/gs_placed_16x.png (renamed from app/assets/icons/gs_placed_16x.png)bin397 -> 397 bytes
-rw-r--r--app/assets/images/icons/gs_received_16x.png (renamed from app/assets/icons/gs_received_16x.png)bin390 -> 390 bytes
-rw-r--r--app/assets/images/icons/phone-down-green-32x.png (renamed from app/assets/icons/phone-down-green-32x.png)bin3426 -> 3426 bytes
-rw-r--r--app/assets/images/icons/phone-down-grey-32x.png (renamed from app/assets/icons/phone-down-grey-32x.png)bin3283 -> 3283 bytes
-rw-r--r--app/assets/images/icons/phone-down-red-32x.png (renamed from app/assets/icons/phone-down-red-32x.png)bin3312 -> 3312 bytes
33 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/icons/cellphone-32x.png b/app/assets/icons/cellphone-32x.png
deleted file mode 100644
index cfc41f5..0000000
--- a/app/assets/icons/cellphone-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/clock-32x.png b/app/assets/icons/clock-32x.png
deleted file mode 100644
index c076042..0000000
--- a/app/assets/icons/clock-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/cross-16x.png b/app/assets/icons/cross-16x.png
deleted file mode 100644
index e22ed6f..0000000
--- a/app/assets/icons/cross-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/facebook-32x.png b/app/assets/icons/facebook-32x.png
deleted file mode 100644
index 08fa0f7..0000000
--- a/app/assets/icons/facebook-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/fax-32x.png b/app/assets/icons/fax-32x.png
deleted file mode 100644
index b05ee59..0000000
--- a/app/assets/icons/fax-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/headphones-16x.png b/app/assets/icons/headphones-16x.png
deleted file mode 100644
index dee8346..0000000
--- a/app/assets/icons/headphones-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/headphones-32x.png b/app/assets/icons/headphones-32x.png
deleted file mode 100644
index 89a5df7..0000000
--- a/app/assets/icons/headphones-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/house-32x.png b/app/assets/icons/house-32x.png
deleted file mode 100644
index b112915..0000000
--- a/app/assets/icons/house-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/mic-32x.png b/app/assets/icons/mic-32x.png
deleted file mode 100644
index 30c4531..0000000
--- a/app/assets/icons/mic-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/microphone-16x.png b/app/assets/icons/microphone-16x.png
deleted file mode 100644
index b62422d..0000000
--- a/app/assets/icons/microphone-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/microphone-32x.png b/app/assets/icons/microphone-32x.png
deleted file mode 100644
index 30c4531..0000000
--- a/app/assets/icons/microphone-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/mute-16x.png b/app/assets/icons/mute-16x.png
deleted file mode 100644
index 0656f3f..0000000
--- a/app/assets/icons/mute-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/phone-down-32x.png b/app/assets/icons/phone-down-32x.png
deleted file mode 100644
index 38c3560..0000000
--- a/app/assets/icons/phone-down-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/phone-mobile-32x.png b/app/assets/icons/phone-mobile-32x.png
deleted file mode 100644
index b373e1a..0000000
--- a/app/assets/icons/phone-mobile-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/phone-up-32x.png b/app/assets/icons/phone-up-32x.png
deleted file mode 100644
index 9b765c7..0000000
--- a/app/assets/icons/phone-up-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/search-13x16.png b/app/assets/icons/search-13x16.png
deleted file mode 100644
index 16aa3c6..0000000
--- a/app/assets/icons/search-13x16.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/skype-32x.png b/app/assets/icons/skype-32x.png
deleted file mode 100644
index c3b0978..0000000
--- a/app/assets/icons/skype-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/star-16x.png b/app/assets/icons/star-16x.png
deleted file mode 100644
index 6b16932..0000000
--- a/app/assets/icons/star-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/suitcase-32x.png b/app/assets/icons/suitcase-32x.png
deleted file mode 100644
index f53daa9..0000000
--- a/app/assets/icons/suitcase-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/tag-16x.png b/app/assets/icons/tag-16x.png
deleted file mode 100644
index b4522d7..0000000
--- a/app/assets/icons/tag-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/twitter-32x.png b/app/assets/icons/twitter-32x.png
deleted file mode 100644
index 51351a7..0000000
--- a/app/assets/icons/twitter-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/unmute-16x.png b/app/assets/icons/unmute-16x.png
deleted file mode 100644
index e9dfde0..0000000
--- a/app/assets/icons/unmute-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/user-16x.png b/app/assets/icons/user-16x.png
deleted file mode 100644
index 909403a..0000000
--- a/app/assets/icons/user-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/user-female-16x.png b/app/assets/icons/user-female-16x.png
deleted file mode 100644
index 38dde34..0000000
--- a/app/assets/icons/user-female-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/user-male-16x.png b/app/assets/icons/user-male-16x.png
deleted file mode 100644
index e03fd0f..0000000
--- a/app/assets/icons/user-male-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/gs_envelope_16x.png b/app/assets/images/icons/gs_envelope_16x.png
index 6a82ade..6a82ade 100644
--- a/app/assets/icons/gs_envelope_16x.png
+++ b/app/assets/images/icons/gs_envelope_16x.png
Binary files differ
diff --git a/app/assets/icons/gs_forward_16x.png b/app/assets/images/icons/gs_forward_16x.png
index 13c57eb..13c57eb 100644
--- a/app/assets/icons/gs_forward_16x.png
+++ b/app/assets/images/icons/gs_forward_16x.png
Binary files differ
diff --git a/app/assets/icons/gs_missed_16x.png b/app/assets/images/icons/gs_missed_16x.png
index 0b3b706..0b3b706 100644
--- a/app/assets/icons/gs_missed_16x.png
+++ b/app/assets/images/icons/gs_missed_16x.png
Binary files differ
diff --git a/app/assets/icons/gs_placed_16x.png b/app/assets/images/icons/gs_placed_16x.png
index b5065e9..b5065e9 100644
--- a/app/assets/icons/gs_placed_16x.png
+++ b/app/assets/images/icons/gs_placed_16x.png
Binary files differ
diff --git a/app/assets/icons/gs_received_16x.png b/app/assets/images/icons/gs_received_16x.png
index cd40c1a..cd40c1a 100644
--- a/app/assets/icons/gs_received_16x.png
+++ b/app/assets/images/icons/gs_received_16x.png
Binary files differ
diff --git a/app/assets/icons/phone-down-green-32x.png b/app/assets/images/icons/phone-down-green-32x.png
index 9f21d45..9f21d45 100644
--- a/app/assets/icons/phone-down-green-32x.png
+++ b/app/assets/images/icons/phone-down-green-32x.png
Binary files differ
diff --git a/app/assets/icons/phone-down-grey-32x.png b/app/assets/images/icons/phone-down-grey-32x.png
index 2b604ce..2b604ce 100644
--- a/app/assets/icons/phone-down-grey-32x.png
+++ b/app/assets/images/icons/phone-down-grey-32x.png
Binary files differ
diff --git a/app/assets/icons/phone-down-red-32x.png b/app/assets/images/icons/phone-down-red-32x.png
index f4cbde7..f4cbde7 100644
--- a/app/assets/icons/phone-down-red-32x.png
+++ b/app/assets/images/icons/phone-down-red-32x.png
Binary files differ