diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-12-29 20:45:58 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-12-29 20:45:58 -0200 |
commit | 97e689213ff4e829f251af526ed4e796a3cc2b71 (patch) | |
tree | b04d03ec56305041216b72328fc9b5afde27bc76 /mod/lightpics/graphics | |
parent | 0ab6351abb7a602d96c62b0ad35413c88113a6cf (diff) | |
parent | 69e2d8c5d8732042c9319aef1fdea45a82b63e42 (diff) | |
download | elgg-97e689213ff4e829f251af526ed4e796a3cc2b71.tar.gz elgg-97e689213ff4e829f251af526ed4e796a3cc2b71.tar.bz2 |
Merge branch 'master' into saravea
Conflicts:
.gitmodules
mod/admins
mod/assemblies
mod/audio_html5
mod/beechat
mod/crud
mod/elgg-activitystreams
mod/elggman
mod/elggpg
mod/favorites
mod/federated-objects
mod/friendly_time
mod/group_alias
mod/group_operators
mod/languages
mod/lightpics
mod/openid_client
mod/spotlight
mod/suicide
mod/tasks
mod/videolist
Diffstat (limited to 'mod/lightpics/graphics')
-rw-r--r-- | mod/lightpics/graphics/empty_album.png | bin | 0 -> 1389 bytes |
-rw-r--r-- | mod/lightpics/graphics/icons/album.gif | bin | 0 -> 1411 bytes |
-rw-r--r-- | mod/lightpics/graphics/icons/general.jpg | bin | 0 -> 7036 bytes |
-rw-r--r-- | mod/lightpics/graphics/icons/river_icon_album.gif | bin | 0 -> 398 bytes |
-rw-r--r-- | mod/lightpics/graphics/icons/river_icon_image.gif | bin | 0 -> 945 bytes |
-rw-r--r-- | mod/lightpics/graphics/icons/river_icon_tag.gif | bin | 0 -> 184 bytes |
-rw-r--r-- | mod/lightpics/graphics/image_error_large.png | bin | 0 -> 2208 bytes |
-rw-r--r-- | mod/lightpics/graphics/image_error_small.png | bin | 0 -> 2351 bytes |
-rw-r--r-- | mod/lightpics/graphics/image_error_thumb.png | bin | 0 -> 759 bytes |
-rw-r--r-- | mod/lightpics/graphics/loader.gif | bin | 0 -> 2545 bytes |
-rw-r--r-- | mod/lightpics/graphics/spacer.gif | bin | 0 -> 43 bytes |
11 files changed, 0 insertions, 0 deletions
diff --git a/mod/lightpics/graphics/empty_album.png b/mod/lightpics/graphics/empty_album.png Binary files differnew file mode 100644 index 000000000..0c041d0a2 --- /dev/null +++ b/mod/lightpics/graphics/empty_album.png diff --git a/mod/lightpics/graphics/icons/album.gif b/mod/lightpics/graphics/icons/album.gif Binary files differnew file mode 100644 index 000000000..73ce91356 --- /dev/null +++ b/mod/lightpics/graphics/icons/album.gif diff --git a/mod/lightpics/graphics/icons/general.jpg b/mod/lightpics/graphics/icons/general.jpg Binary files differnew file mode 100644 index 000000000..23494eff2 --- /dev/null +++ b/mod/lightpics/graphics/icons/general.jpg diff --git a/mod/lightpics/graphics/icons/river_icon_album.gif b/mod/lightpics/graphics/icons/river_icon_album.gif Binary files differnew file mode 100644 index 000000000..e1bbfedaa --- /dev/null +++ b/mod/lightpics/graphics/icons/river_icon_album.gif diff --git a/mod/lightpics/graphics/icons/river_icon_image.gif b/mod/lightpics/graphics/icons/river_icon_image.gif Binary files differnew file mode 100644 index 000000000..cf391898e --- /dev/null +++ b/mod/lightpics/graphics/icons/river_icon_image.gif diff --git a/mod/lightpics/graphics/icons/river_icon_tag.gif b/mod/lightpics/graphics/icons/river_icon_tag.gif Binary files differnew file mode 100644 index 000000000..510696147 --- /dev/null +++ b/mod/lightpics/graphics/icons/river_icon_tag.gif diff --git a/mod/lightpics/graphics/image_error_large.png b/mod/lightpics/graphics/image_error_large.png Binary files differnew file mode 100644 index 000000000..4316f459d --- /dev/null +++ b/mod/lightpics/graphics/image_error_large.png diff --git a/mod/lightpics/graphics/image_error_small.png b/mod/lightpics/graphics/image_error_small.png Binary files differnew file mode 100644 index 000000000..2f814fd81 --- /dev/null +++ b/mod/lightpics/graphics/image_error_small.png diff --git a/mod/lightpics/graphics/image_error_thumb.png b/mod/lightpics/graphics/image_error_thumb.png Binary files differnew file mode 100644 index 000000000..0eeb797dc --- /dev/null +++ b/mod/lightpics/graphics/image_error_thumb.png diff --git a/mod/lightpics/graphics/loader.gif b/mod/lightpics/graphics/loader.gif Binary files differnew file mode 100644 index 000000000..7ac990cf0 --- /dev/null +++ b/mod/lightpics/graphics/loader.gif diff --git a/mod/lightpics/graphics/spacer.gif b/mod/lightpics/graphics/spacer.gif Binary files differnew file mode 100644 index 000000000..e565824aa --- /dev/null +++ b/mod/lightpics/graphics/spacer.gif |