diff options
| author | Eben Eliason <eben@laptop.org> | 2007-10-19 17:38:52 (GMT) |
|---|---|---|
| committer | Eben Eliason <eben@laptop.org> | 2007-10-19 17:38:52 (GMT) |
| commit | 684d91ce696494ce92adb8746b2b1525c62aefeb (patch) | |
| tree | 5285e5f47d563e5ee5175e542e2f5d5d43e45dde | |
| parent | 6c648471456284a6888339245a886a1b4ee90a7c (diff) | |
| parent | d23799239cbb1e0d373a4e332a833d61134aff07 (diff) | |
Merge branch 'master' of git+ssh://eben@dev.laptop.org/git/artwork
Conflicts:
NEWS
icons/scalable/actions/Makefile.am
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | icons/scalable/actions/Makefile.am | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,7 @@ * updated emblems, zoom icons (eben) + +Snapshot 576467288f + * Updated previous and next icons (eben) Snapshot 8669b6145b diff --git a/icons/scalable/actions/Makefile.am b/icons/scalable/actions/Makefile.am index f3347ed..52d25d6 100644 --- a/icons/scalable/actions/Makefile.am +++ b/icons/scalable/actions/Makefile.am @@ -32,8 +32,9 @@ icon_DATA = \ go-left.svg \ go-right.svg \ go-next.svg \ + go-next-paired.svg \ go-previous.svg \ - go-previous-mini.svg \ + go-previous-paired.svg \ insert-image.svg \ insert-table.svg \ invite.svg \ |