diff options
| author | dmazzone <mazzone.diego@gmail.com> | 2010-09-23 17:58:37 (GMT) |
|---|---|---|
| committer | dmazzone <mazzone.diego@gmail.com> | 2010-09-23 17:58:37 (GMT) |
| commit | 3f1c735394e4c834d07e40aac883d132e0142700 (patch) | |
| tree | f17aaafe4e58d671200f2ec5fe24fde3f4b79406 | |
| parent | d7cec91757c175b58c4fc4014e4ef098f3137705 (diff) | |
| parent | 594d3bd7b042f9614ca589bf557e828b410ea764 (diff) | |
Merge manual, había conflicto en game.py.
Merge branch 'master' of git://git.sugarlabs.org/saludame/mainline
Conflicts:
Saludame.activity/game.py
0 files changed, 0 insertions, 0 deletions