diff options
| author | Kali Kaneko <kali@leap.se> | 2013-09-12 14:29:32 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-09-12 14:29:32 +0200 |
| commit | b1a2ec9a672d6f097d56d039d164918508f72ceb (patch) | |
| tree | 0e259ada6c41b5e660f2e64188238acf4594f140 /data | |
| parent | 4951157e3740b42ecef6775c8927b912a6ee8870 (diff) | |
| parent | 9568093138c85212e15d50ade5d5fc7dcec9ff6e (diff) | |
Merge branch 'master' into debian
Conflicts:
pkg/requirements.pip
setup.py
Diffstat (limited to 'data')
| -rw-r--r-- | data/images/Globe.png | bin | 22470 -> 0 bytes |
| -rw-r--r-- | data/images/favicon.ico | bin | 318 -> 1150 bytes |
| -rw-r--r-- | data/images/leap-color-small.png | bin | 10100 -> 0 bytes |
| -rw-r--r-- | data/images/mask-small.png | bin | 0 -> 18172 bytes |
| -rw-r--r-- | data/images/watermark.png | bin | 22819 -> 0 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/data/images/Globe.png b/data/images/Globe.png Binary files differdeleted file mode 100644 index 7549433b..00000000 --- a/data/images/Globe.png +++ /dev/null diff --git a/data/images/favicon.ico b/data/images/favicon.ico Binary files differindex b5f3505a..7f41dd1d 100644 --- a/data/images/favicon.ico +++ b/data/images/favicon.ico diff --git a/data/images/leap-color-small.png b/data/images/leap-color-small.png Binary files differdeleted file mode 100644 index bc9d4e7f..00000000 --- a/data/images/leap-color-small.png +++ /dev/null diff --git a/data/images/mask-small.png b/data/images/mask-small.png Binary files differnew file mode 100644 index 00000000..5f5f1b41 --- /dev/null +++ b/data/images/mask-small.png diff --git a/data/images/watermark.png b/data/images/watermark.png Binary files differdeleted file mode 100644 index d8e3f965..00000000 --- a/data/images/watermark.png +++ /dev/null |
