diff options
| author | Thomas Pointhuber <thomas.pointhuber@gmx.at> | 2015-01-09 21:25:13 +0100 |
|---|---|---|
| committer | Thomas Pointhuber <thomas.pointhuber@gmx.at> | 2015-01-09 21:30:09 +0100 |
| commit | 400b54191c590663f0cfe91045f70a5d9223aa19 (patch) | |
| tree | 08c71466ac8fbaf69872f114847baec762f5bd81 /searx/static/themes/oscar/img/map | |
| parent | af8dac93a8acff5042b7b399c38e348f0bdc32ad (diff) | |
| parent | c8be128e97479ea6c871c4b6fbf014fa8136e708 (diff) | |
Merge branch 'master' of https://github.com/asciimoo/searx into code_results
Conflicts:
searx/engines/searchcode_code.py
searx/engines/searchcode_doc.py
searx/static/oscar/js/searx.min.js
searx/templates/oscar/result_templates/default.html
searx/templates/oscar/result_templates/images.html
searx/templates/oscar/result_templates/map.html
searx/templates/oscar/result_templates/torrent.html
searx/templates/oscar/result_templates/videos.html
Diffstat (limited to 'searx/static/themes/oscar/img/map')
| -rw-r--r-- | searx/static/themes/oscar/img/map/layers-2x.png | bin | 0 -> 2898 bytes |
| -rw-r--r-- | searx/static/themes/oscar/img/map/layers.png | bin | 0 -> 1502 bytes |
| -rw-r--r-- | searx/static/themes/oscar/img/map/marker-icon-2x-green.png | bin | 0 -> 4203 bytes |
| -rw-r--r-- | searx/static/themes/oscar/img/map/marker-icon-2x-orange.png | bin | 0 -> 4167 bytes |
| -rw-r--r-- | searx/static/themes/oscar/img/map/marker-icon-2x-red.png | bin | 0 -> 4230 bytes |
| -rw-r--r-- | searx/static/themes/oscar/img/map/marker-icon-2x.png | bin | 0 -> 4033 bytes |
| -rw-r--r-- | searx/static/themes/oscar/img/map/marker-icon-green.png | bin | 0 -> 1822 bytes |
| -rw-r--r-- | searx/static/themes/oscar/img/map/marker-icon-orange.png | bin | 0 -> 1862 bytes |
| -rw-r--r-- | searx/static/themes/oscar/img/map/marker-icon-red.png | bin | 0 -> 1870 bytes |
| -rw-r--r-- | searx/static/themes/oscar/img/map/marker-icon.png | bin | 0 -> 1747 bytes |
| -rw-r--r-- | searx/static/themes/oscar/img/map/marker-shadow.png | bin | 0 -> 797 bytes |
11 files changed, 0 insertions, 0 deletions
diff --git a/searx/static/themes/oscar/img/map/layers-2x.png b/searx/static/themes/oscar/img/map/layers-2x.png Binary files differnew file mode 100644 index 000000000..a2cf7f9ef --- /dev/null +++ b/searx/static/themes/oscar/img/map/layers-2x.png diff --git a/searx/static/themes/oscar/img/map/layers.png b/searx/static/themes/oscar/img/map/layers.png Binary files differnew file mode 100644 index 000000000..bca0a0e42 --- /dev/null +++ b/searx/static/themes/oscar/img/map/layers.png diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x-green.png b/searx/static/themes/oscar/img/map/marker-icon-2x-green.png Binary files differnew file mode 100644 index 000000000..c359abb6c --- /dev/null +++ b/searx/static/themes/oscar/img/map/marker-icon-2x-green.png diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x-orange.png b/searx/static/themes/oscar/img/map/marker-icon-2x-orange.png Binary files differnew file mode 100644 index 000000000..c3c863211 --- /dev/null +++ b/searx/static/themes/oscar/img/map/marker-icon-2x-orange.png diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x-red.png b/searx/static/themes/oscar/img/map/marker-icon-2x-red.png Binary files differnew file mode 100644 index 000000000..1c26e9fc2 --- /dev/null +++ b/searx/static/themes/oscar/img/map/marker-icon-2x-red.png diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x.png b/searx/static/themes/oscar/img/map/marker-icon-2x.png Binary files differnew file mode 100644 index 000000000..0015b6495 --- /dev/null +++ b/searx/static/themes/oscar/img/map/marker-icon-2x.png diff --git a/searx/static/themes/oscar/img/map/marker-icon-green.png b/searx/static/themes/oscar/img/map/marker-icon-green.png Binary files differnew file mode 100644 index 000000000..56db5ea9f --- /dev/null +++ b/searx/static/themes/oscar/img/map/marker-icon-green.png diff --git a/searx/static/themes/oscar/img/map/marker-icon-orange.png b/searx/static/themes/oscar/img/map/marker-icon-orange.png Binary files differnew file mode 100644 index 000000000..fbbce7b2a --- /dev/null +++ b/searx/static/themes/oscar/img/map/marker-icon-orange.png diff --git a/searx/static/themes/oscar/img/map/marker-icon-red.png b/searx/static/themes/oscar/img/map/marker-icon-red.png Binary files differnew file mode 100644 index 000000000..3e64e06d1 --- /dev/null +++ b/searx/static/themes/oscar/img/map/marker-icon-red.png diff --git a/searx/static/themes/oscar/img/map/marker-icon.png b/searx/static/themes/oscar/img/map/marker-icon.png Binary files differnew file mode 100644 index 000000000..e2e9f757f --- /dev/null +++ b/searx/static/themes/oscar/img/map/marker-icon.png diff --git a/searx/static/themes/oscar/img/map/marker-shadow.png b/searx/static/themes/oscar/img/map/marker-shadow.png Binary files differnew file mode 100644 index 000000000..d1e773c71 --- /dev/null +++ b/searx/static/themes/oscar/img/map/marker-shadow.png |
