diff options
author | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
commit | e53d410129701ea1c9d19529afa493f11b5f5b70 (patch) | |
tree | d9963b24bf8932654b4a47e36602c75975e50dba /_graphics | |
parent | 377da25d2965c64941f83baae119fc970ec60982 (diff) | |
parent | 08a962c98e2923724f8013d6eaae89101243752a (diff) | |
download | elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.gz elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.bz2 |
Merge github.com:Elgg/Elgg
Conflicts:
engine/lib/input.php
Diffstat (limited to '_graphics')
-rw-r--r-- | _graphics/elgg_sprites.png | bin | 16680 -> 19302 bytes |
-rw-r--r-- | _graphics/walled_garden/one_column_bottom.png | bin | 0 -> 522 bytes |
-rw-r--r-- | _graphics/walled_garden/one_column_middle.png | bin | 0 -> 226 bytes |
-rw-r--r-- | _graphics/walled_garden/one_column_top.png | bin | 0 -> 517 bytes |
-rw-r--r-- | _graphics/walled_garden/two_column_bottom.png | bin | 0 -> 532 bytes |
-rw-r--r-- | _graphics/walled_garden/two_column_middle.png | bin | 0 -> 231 bytes |
-rw-r--r-- | _graphics/walled_garden/two_column_top.png | bin | 0 -> 547 bytes |
-rw-r--r-- | _graphics/walled_garden_background_bottom.gif | bin | 2940 -> 0 bytes |
-rw-r--r-- | _graphics/walled_garden_background_extend.gif | bin | 199 -> 0 bytes |
-rw-r--r-- | _graphics/walled_garden_background_top.gif | bin | 4257 -> 0 bytes |
-rw-r--r-- | _graphics/walled_garden_backgroundfull_bottom.gif | bin | 2811 -> 0 bytes |
-rw-r--r-- | _graphics/walled_garden_backgroundfull_top.gif | bin | 6786 -> 0 bytes |
12 files changed, 0 insertions, 0 deletions
diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png Binary files differindex 703ff0c81..02b452d94 100644 --- a/_graphics/elgg_sprites.png +++ b/_graphics/elgg_sprites.png diff --git a/_graphics/walled_garden/one_column_bottom.png b/_graphics/walled_garden/one_column_bottom.png Binary files differnew file mode 100644 index 000000000..1dfd7f8ad --- /dev/null +++ b/_graphics/walled_garden/one_column_bottom.png diff --git a/_graphics/walled_garden/one_column_middle.png b/_graphics/walled_garden/one_column_middle.png Binary files differnew file mode 100644 index 000000000..f53abc123 --- /dev/null +++ b/_graphics/walled_garden/one_column_middle.png diff --git a/_graphics/walled_garden/one_column_top.png b/_graphics/walled_garden/one_column_top.png Binary files differnew file mode 100644 index 000000000..429a88b75 --- /dev/null +++ b/_graphics/walled_garden/one_column_top.png diff --git a/_graphics/walled_garden/two_column_bottom.png b/_graphics/walled_garden/two_column_bottom.png Binary files differnew file mode 100644 index 000000000..8aeceeeee --- /dev/null +++ b/_graphics/walled_garden/two_column_bottom.png diff --git a/_graphics/walled_garden/two_column_middle.png b/_graphics/walled_garden/two_column_middle.png Binary files differnew file mode 100644 index 000000000..9a93f19a9 --- /dev/null +++ b/_graphics/walled_garden/two_column_middle.png diff --git a/_graphics/walled_garden/two_column_top.png b/_graphics/walled_garden/two_column_top.png Binary files differnew file mode 100644 index 000000000..c28b3f630 --- /dev/null +++ b/_graphics/walled_garden/two_column_top.png diff --git a/_graphics/walled_garden_background_bottom.gif b/_graphics/walled_garden_background_bottom.gif Binary files differdeleted file mode 100644 index 7e25fbedc..000000000 --- a/_graphics/walled_garden_background_bottom.gif +++ /dev/null diff --git a/_graphics/walled_garden_background_extend.gif b/_graphics/walled_garden_background_extend.gif Binary files differdeleted file mode 100644 index 09f7318e3..000000000 --- a/_graphics/walled_garden_background_extend.gif +++ /dev/null diff --git a/_graphics/walled_garden_background_top.gif b/_graphics/walled_garden_background_top.gif Binary files differdeleted file mode 100644 index 20d551e2f..000000000 --- a/_graphics/walled_garden_background_top.gif +++ /dev/null diff --git a/_graphics/walled_garden_backgroundfull_bottom.gif b/_graphics/walled_garden_backgroundfull_bottom.gif Binary files differdeleted file mode 100644 index c05447cc8..000000000 --- a/_graphics/walled_garden_backgroundfull_bottom.gif +++ /dev/null diff --git a/_graphics/walled_garden_backgroundfull_top.gif b/_graphics/walled_garden_backgroundfull_top.gif Binary files differdeleted file mode 100644 index 99b4832ec..000000000 --- a/_graphics/walled_garden_backgroundfull_top.gif +++ /dev/null |