diff options
| author | Wade Brainerd <wadetb@gmail.com> | 2009-10-31 16:28:11 (GMT) |
|---|---|---|
| committer | Wade Brainerd <wadetb@gmail.com> | 2009-10-31 16:28:11 (GMT) |
| commit | 40517089bb1fe92b120ea43c248a20d88c5c0fdb (patch) | |
| tree | 7e720509670253e2c83e3b9a82716c25c53e0e6c /po | |
| parent | 122710eab16e9554db1ac602cf84807d4012baef (diff) | |
| parent | a8c615cc33b289a95ce861d3c3168f4a86451c12 (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/colors/videopaint
Conflicts:
colors.py
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions