diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-04 06:07:28 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-04 06:07:28 -0800 |
| commit | b218aee94e581230e1efa14d4ae1a19756986ddf (patch) | |
| tree | a832ddf3b4322b520fd20c4d8ea2d31720c3679b /theme/base/images | |
| parent | 358556057a87c0cb9291223a2026782e6548ff2e (diff) | |
| parent | 14d7f4a598d0e24467fe3eafd9a02b0e651edad8 (diff) | |
Merge commit 'origin/testing' into 0.9.x
Conflicts:
lib/action.php
lib/adminpanelaction.php
Diffstat (limited to 'theme/base/images')
| -rw-r--r-- | theme/base/images/icons/README | 5 | ||||
| -rw-r--r-- | theme/base/images/icons/icons-01.gif | bin | 3740 -> 4080 bytes |
2 files changed, 5 insertions, 0 deletions
diff --git a/theme/base/images/icons/README b/theme/base/images/icons/README index ea582149f..f701959ca 100644 --- a/theme/base/images/icons/README +++ b/theme/base/images/icons/README @@ -45,6 +45,11 @@ White pin with green background White underscore with green background White C with green background + White magic wand with green background + Green badge with white background + Green sandbox with white background + Green speech bubble broken with white background + Green person with tie with white background */ Created by various authors diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif Binary files differindex be884ff48..bf0f1230e 100644 --- a/theme/base/images/icons/icons-01.gif +++ b/theme/base/images/icons/icons-01.gif |
