diff options
| author | friendica <info@friendica.com> | 2012-07-07 22:04:31 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-07 22:04:31 -0700 |
| commit | 8c3703c4f97ff0f3a54f48a3d02ed15060a2d5c1 (patch) | |
| tree | 7c8f114e8eb889ca65803d7f28b81388da32ce85 /view/theme/diabook | |
| parent | 1965c7076963e4b0fe43287977f6ece9520ca7c9 (diff) | |
| parent | 63f10f6c6bb1ce794643b7511ab50cd810b79595 (diff) | |
| download | volse-hubzilla-8c3703c4f97ff0f3a54f48a3d02ed15060a2d5c1.tar.gz volse-hubzilla-8c3703c4f97ff0f3a54f48a3d02ed15060a2d5c1.tar.bz2 volse-hubzilla-8c3703c4f97ff0f3a54f48a3d02ed15060a2d5c1.zip | |
Merge branch 'master' of file:////home/macgirvin/dev
Conflicts:
boot.php
Diffstat (limited to 'view/theme/diabook')
48 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl index db1936e4b..db1936e4b 100755..100644 --- a/view/theme/diabook/ch_directory_item.tpl +++ b/view/theme/diabook/ch_directory_item.tpl diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index caefed3b3..caefed3b3 100755..100644 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl index 48930b48a..48930b48a 100755..100644 --- a/view/theme/diabook/contact_template.tpl +++ b/view/theme/diabook/contact_template.tpl diff --git a/view/theme/diabook/diabook-aerith/icons/block.png b/view/theme/diabook/diabook-aerith/icons/block.png Binary files differindex a0b1dffe9..a0b1dffe9 100755..100644 --- a/view/theme/diabook/diabook-aerith/icons/block.png +++ b/view/theme/diabook/diabook-aerith/icons/block.png diff --git a/view/theme/diabook/diabook-blue/icons/block.png b/view/theme/diabook/diabook-blue/icons/block.png Binary files differindex a0b1dffe9..a0b1dffe9 100755..100644 --- a/view/theme/diabook/diabook-blue/icons/block.png +++ b/view/theme/diabook/diabook-blue/icons/block.png diff --git a/view/theme/diabook/diabook-dark/icons/block.png b/view/theme/diabook/diabook-dark/icons/block.png Binary files differindex a0b1dffe9..a0b1dffe9 100755..100644 --- a/view/theme/diabook/diabook-dark/icons/block.png +++ b/view/theme/diabook/diabook-dark/icons/block.png diff --git a/view/theme/diabook/diabook-green/icons/block.png b/view/theme/diabook/diabook-green/icons/block.png Binary files differindex a0b1dffe9..a0b1dffe9 100755..100644 --- a/view/theme/diabook/diabook-green/icons/block.png +++ b/view/theme/diabook/diabook-green/icons/block.png diff --git a/view/theme/diabook/diabook-green/icons/notifications3.png b/view/theme/diabook/diabook-green/icons/notifications3.png Binary files differindex 2c9c791c0..2c9c791c0 100755..100644 --- a/view/theme/diabook/diabook-green/icons/notifications3.png +++ b/view/theme/diabook/diabook-green/icons/notifications3.png diff --git a/view/theme/diabook/diabook-green/icons/notify3.png b/view/theme/diabook/diabook-green/icons/notify3.png Binary files differindex 9b852d05b..9b852d05b 100755..100644 --- a/view/theme/diabook/diabook-green/icons/notify3.png +++ b/view/theme/diabook/diabook-green/icons/notify3.png diff --git a/view/theme/diabook/diabook-pink/icons/block.png b/view/theme/diabook/diabook-pink/icons/block.png Binary files differindex a0b1dffe9..a0b1dffe9 100755..100644 --- a/view/theme/diabook/diabook-pink/icons/block.png +++ b/view/theme/diabook/diabook-pink/icons/block.png diff --git a/view/theme/diabook/diabook-pink/icons/notifications3.png b/view/theme/diabook/diabook-pink/icons/notifications3.png Binary files differindex 2c9c791c0..2c9c791c0 100755..100644 --- a/view/theme/diabook/diabook-pink/icons/notifications3.png +++ b/view/theme/diabook/diabook-pink/icons/notifications3.png diff --git a/view/theme/diabook/diabook-pink/icons/notify3.png b/view/theme/diabook/diabook-pink/icons/notify3.png Binary files differindex 9b852d05b..9b852d05b 100755..100644 --- a/view/theme/diabook/diabook-pink/icons/notify3.png +++ b/view/theme/diabook/diabook-pink/icons/notify3.png diff --git a/view/theme/diabook/diabook-red/icons/block.png b/view/theme/diabook/diabook-red/icons/block.png Binary files differindex a0b1dffe9..a0b1dffe9 100755..100644 --- a/view/theme/diabook/diabook-red/icons/block.png +++ b/view/theme/diabook/diabook-red/icons/block.png diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl index 70d197955..70d197955 100755..100644 --- a/view/theme/diabook/directory_item.tpl +++ b/view/theme/diabook/directory_item.tpl diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl index ce4b25fbf..ce4b25fbf 100755..100644 --- a/view/theme/diabook/group_side.tpl +++ b/view/theme/diabook/group_side.tpl diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png Binary files differindex 1958041cf..1958041cf 100755..100644 --- a/view/theme/diabook/icons/attach.png +++ b/view/theme/diabook/icons/attach.png diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png Binary files differindex 8d779a409..8d779a409 100755..100644 --- a/view/theme/diabook/icons/audio.png +++ b/view/theme/diabook/icons/audio.png diff --git a/view/theme/diabook/icons/block.png b/view/theme/diabook/icons/block.png Binary files differindex a0b1dffe9..a0b1dffe9 100755..100644 --- a/view/theme/diabook/icons/block.png +++ b/view/theme/diabook/icons/block.png diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png Binary files differindex a5c7f1236..a5c7f1236 100755..100644 --- a/view/theme/diabook/icons/camera.png +++ b/view/theme/diabook/icons/camera.png diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png Binary files differindex 28e2675b8..28e2675b8 100755..100644 --- a/view/theme/diabook/icons/close_box.png +++ b/view/theme/diabook/icons/close_box.png diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png Binary files differindex 7817279f4..7817279f4 100755..100644 --- a/view/theme/diabook/icons/contacts2.png +++ b/view/theme/diabook/icons/contacts2.png diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png Binary files differindex 2abb82ef2..2abb82ef2 100755..100644 --- a/view/theme/diabook/icons/drop.png +++ b/view/theme/diabook/icons/drop.png diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png Binary files differindex a46e88ea5..a46e88ea5 100755..100644 --- a/view/theme/diabook/icons/expand.png +++ b/view/theme/diabook/icons/expand.png diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png Binary files differindex 16713fa53..16713fa53 100755..100644 --- a/view/theme/diabook/icons/file_as.png +++ b/view/theme/diabook/icons/file_as.png diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png Binary files differindex 0ef666a67..0ef666a67 100755..100644 --- a/view/theme/diabook/icons/link.png +++ b/view/theme/diabook/icons/link.png diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png Binary files differindex 7e34bf279..7e34bf279 100755..100644 --- a/view/theme/diabook/icons/lock.png +++ b/view/theme/diabook/icons/lock.png diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png Binary files differindex f8b228347..f8b228347 100755..100644 --- a/view/theme/diabook/icons/lupe.png +++ b/view/theme/diabook/icons/lupe.png diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png Binary files differindex 7b5e25b90..7b5e25b90 100755..100644 --- a/view/theme/diabook/icons/next.png +++ b/view/theme/diabook/icons/next.png diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png Binary files differindex 347f1519e..347f1519e 100755..100644 --- a/view/theme/diabook/icons/notifications.png +++ b/view/theme/diabook/icons/notifications.png diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png Binary files differindex 2c9c791c0..2c9c791c0 100755..100644 --- a/view/theme/diabook/icons/notifications3.png +++ b/view/theme/diabook/icons/notifications3.png diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png Binary files differindex 355abb1eb..355abb1eb 100755..100644 --- a/view/theme/diabook/icons/notify.png +++ b/view/theme/diabook/icons/notify.png diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png Binary files differindex 9b852d05b..9b852d05b 100755..100644 --- a/view/theme/diabook/icons/notify3.png +++ b/view/theme/diabook/icons/notify3.png diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png Binary files differindex 772e49b17..772e49b17 100755..100644 --- a/view/theme/diabook/icons/pencil.png +++ b/view/theme/diabook/icons/pencil.png diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png Binary files differindex 55c1464ba..55c1464ba 100755..100644 --- a/view/theme/diabook/icons/prev.png +++ b/view/theme/diabook/icons/prev.png diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png Binary files differindex c3b8d2bf4..c3b8d2bf4 100755..100644 --- a/view/theme/diabook/icons/recycle.png +++ b/view/theme/diabook/icons/recycle.png diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png Binary files differindex a560cc55e..a560cc55e 100755..100644 --- a/view/theme/diabook/icons/remote.png +++ b/view/theme/diabook/icons/remote.png diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png Binary files differindex 0e7f7ae6a..0e7f7ae6a 100755..100644 --- a/view/theme/diabook/icons/scroll_top.png +++ b/view/theme/diabook/icons/scroll_top.png diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png Binary files differindex 0b00cb189..0b00cb189 100755..100644 --- a/view/theme/diabook/icons/star.png +++ b/view/theme/diabook/icons/star.png diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png Binary files differindex 2b82dfca3..2b82dfca3 100755..100644 --- a/view/theme/diabook/icons/starred.png +++ b/view/theme/diabook/icons/starred.png diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png Binary files differindex 144649ef8..144649ef8 100755..100644 --- a/view/theme/diabook/icons/tagged.png +++ b/view/theme/diabook/icons/tagged.png diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png Binary files differindex a0cda0ae5..a0cda0ae5 100755..100644 --- a/view/theme/diabook/icons/unlock.png +++ b/view/theme/diabook/icons/unlock.png diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png Binary files differindex ba3183f5c..ba3183f5c 100755..100644 --- a/view/theme/diabook/icons/unstarred.png +++ b/view/theme/diabook/icons/unstarred.png diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png Binary files differindex a03d1d818..a03d1d818 100755..100644 --- a/view/theme/diabook/icons/video.png +++ b/view/theme/diabook/icons/video.png diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png Binary files differindex 216e78344..216e78344 100755..100644 --- a/view/theme/diabook/icons/weblink.png +++ b/view/theme/diabook/icons/weblink.png diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 1d94cb6d3..1d94cb6d3 100755..100644 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl index 989f17878..989f17878 100755..100644 --- a/view/theme/diabook/mail_conv.tpl +++ b/view/theme/diabook/mail_conv.tpl diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl index 123834064..123834064 100755..100644 --- a/view/theme/diabook/search_item.tpl +++ b/view/theme/diabook/search_item.tpl diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 53048df6c..53048df6c 100755..100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php |
