diff options
| author | Sean Murphy <sgmurphy@gmail.com> | 2009-02-07 11:02:10 -0500 |
|---|---|---|
| committer | Sean Murphy <sgmurphy@gmail.com> | 2009-02-07 11:02:10 -0500 |
| commit | a3d5e00f64b3c166e34a8d36fcb4f5b757394e9b (patch) | |
| tree | 91576e428997bc6cc826fa2cead37794961de23c /theme/base/images/icons | |
| parent | d90089314944ed1696f66cabbb6935ea61e4b2e6 (diff) | |
| parent | 08db50b24eaf9e6e5f651448c394f1f50dd2409b (diff) | |
Merge commit 'upstream/0.7.x' into 0.7.x
Conflicts:
actions/showstream.php
Diffstat (limited to 'theme/base/images/icons')
| -rw-r--r-- | theme/base/images/icons/icon_atom.jpg | bin | 1117 -> 0 bytes |
| -rw-r--r-- | theme/base/images/icons/icon_atom.png | bin | 0 -> 820 bytes |
| -rw-r--r-- | theme/base/images/icons/icon_rss.jpg | bin | 1166 -> 0 bytes |
| -rw-r--r-- | theme/base/images/icons/icon_rss.png | bin | 0 -> 777 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/theme/base/images/icons/icon_atom.jpg b/theme/base/images/icons/icon_atom.jpg Binary files differdeleted file mode 100644 index 22853edc4..000000000 --- a/theme/base/images/icons/icon_atom.jpg +++ /dev/null diff --git a/theme/base/images/icons/icon_atom.png b/theme/base/images/icons/icon_atom.png Binary files differnew file mode 100644 index 000000000..6a001f11a --- /dev/null +++ b/theme/base/images/icons/icon_atom.png diff --git a/theme/base/images/icons/icon_rss.jpg b/theme/base/images/icons/icon_rss.jpg Binary files differdeleted file mode 100644 index da23422d0..000000000 --- a/theme/base/images/icons/icon_rss.jpg +++ /dev/null diff --git a/theme/base/images/icons/icon_rss.png b/theme/base/images/icons/icon_rss.png Binary files differnew file mode 100644 index 000000000..0ccd1ce25 --- /dev/null +++ b/theme/base/images/icons/icon_rss.png |
