diff options
| author | Simon Poirier <simpoir@Eridani.(none)> | 2009-09-18 15:49:43 (GMT) |
|---|---|---|
| committer | Simon Poirier <simpoir@Eridani.(none)> | 2009-09-18 15:49:43 (GMT) |
| commit | 4c41576c95648cc5741cabc3acb5d9f0bb8b11fc (patch) | |
| tree | 42ce7cbad6e75d2cea4e99187617b1b2f337e246 /tutorius | |
| parent | 057b982d6e4b0d3bf2801ec87fd9430fa2774c0b (diff) | |
| parent | 24a02a6fefafb6ff911c568cf38992c2f9107f2c (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:tutorius/mainline
Conflicts:
setup.py
toolkitfix/__init__.py
Diffstat (limited to 'tutorius')
0 files changed, 0 insertions, 0 deletions