diff options
| author | Simon Schampijer <simon@schampijer.de> | 2009-01-16 11:10:18 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2009-01-16 11:10:18 (GMT) |
| commit | 9292586f9037921a30f91b557504c11bf24f95ca (patch) | |
| tree | 8d33a743016291e9c1869e928dca54d4894567d2 /configure.ac | |
| parent | a7303384a45db6ff90484f9d844002904e9ab2bf (diff) | |
| parent | 695303e9eb23ddf6c7549d0ffbbd2090b718cc68 (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-artwork/mainline
Conflicts:
icons/scalable/actions/Makefile.am
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions