diff options
| author | Oli <olpc@localhost.localdomain> | 2007-02-17 02:18:11 (GMT) |
|---|---|---|
| committer | Oli <olpc@localhost.localdomain> | 2007-02-17 02:18:11 (GMT) |
| commit | d49ef42a259304a108957c103705d45c47d4956e (patch) | |
| tree | 41c4cc3b8747d29ddf577399dcb6d130df782615 /scripts | |
| parent | 4971d4a399677fd7b87c5c4c5a02569ea8f66732 (diff) | |
| parent | ac64a2be0288c0664ec92b888fba86055d61a918 (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Conflicts:
Player/Trackpad.py
nothing to commit
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions