diff options
| author | amartin <olpc@localhost.localdomain> | 2007-02-27 06:45:35 (GMT) |
|---|---|---|
| committer | amartin <olpc@localhost.localdomain> | 2007-02-27 06:45:35 (GMT) |
| commit | efde4e823dc4418763514e0634fc3c1393ba36d8 (patch) | |
| tree | 8a2ef8801ab710116833ff5d52754a858b8b1afb /scripts/activity-install.sh | |
| parent | 2fbfd856f3e91fca3b48c0ae5eea9058dd5f1964 (diff) | |
| parent | c99f35c74c57872754cdef5c948efbcd9ed53f04 (diff) | |
Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam
Conflicts:
Edit/MainWindow.py
Diffstat (limited to 'scripts/activity-install.sh')
0 files changed, 0 insertions, 0 deletions