diff options
author | Walter Bender <walter.bender@gmail.com> | 2011-11-08 00:12:29 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2011-11-08 00:12:29 (GMT) |
commit | 4739976d0a96eb21b8f606c69ecc09ca7a1557de (patch) | |
tree | 57170dde71aee01aac39059ebd300a3e5aa9e7e3 /icons/eraseron.svg | |
parent | b81f399d5c57465e95cca0fac241975bc75df303 (diff) | |
parent | a7a87c7fa872418f8db1af7badd4c91e0481c2af (diff) |
Merge commit 'refs/merge-requests/3' of git://git.sugarlabs.org/turtleart/mainline into integration
Conflicts:
NEWS
activity/activity.info
Diffstat (limited to 'icons/eraseron.svg')
0 files changed, 0 insertions, 0 deletions