[gnome-icon-theme/one-canvas: 2/2] resolve conflict

[Jakub Steiner <jimmac src gnome org>]

commit e0f8710122f08f18046211790577a0ad4988f7df
Merge: aed660d... a18356d...
Author: Jakub Steiner <jimmac gmail com>
Date:   Fri Aug 21 17:10:07 2009 +0200

    resolve conflict

 src/ChangeLog                  |   69 +
 src/TODO                       |    9 +
 src/go-previous.svg            |  878 ++-
 src/help-browser.svg           | 1019 +--
 src/input-gaming.svg           |  491 +-
 src/mail-mark-important.svg    | 1639 +----
 src/media-floppy.svg           |  281 +-
 src/network-server.svg         |15669 +++++++++++++++++++++++++++++++++++++---
 src/object-flip-horizontal.svg |  629 +--
 src/object-flip-vertical.svg   |  707 +--
 src/object-rotate-left.svg     |  554 +--
 src/object-rotate-right.svg    |  540 +--
 src/preferences-other.svg      |  307 +-
 src/process-stop.svg           |  149 +-
 src/security-high.svg          | 1937 +++++-
 src/security-low.svg           | 1712 ++++--
 src/security-medium.svg        | 1490 ++++-
 src/start-here.svg             |  300 +-
 src/system-log-out.svg         | 1583 +++--
 src/system-search.svg          | 2564 ++++----
 src/system-shutdown.svg        | 1434 ++++-
 src/users.svg                  | 1724 ++++--
 src/utilities-terminal.svg     | 2771 ++++----
 src/web-browser.svg            |  686 ++-
 src/window-new.svg             |  206 +-
 25 files changed, 28655 insertions(+), 10693 deletions(-)
---