diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-08-13 07:53:35 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-08-13 07:53:35 (GMT) |
| commit | 93c4a2834215fbcc5a44074772771c16e7edda65 (patch) | |
| tree | 643ee3e066f5fbcb54158a21c84526b6f3e06bc8 /src/jarabe/model/network.py | |
| parent | 4a3416b9acdfdd533ee2d69633f1383476db5e71 (diff) | |
| parent | 612f60917242a0fd59953eece0a0c884a7b5d04b (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/sugar/frans-clone
Conflicts:
extensions/deviceicon/network.py
Diffstat (limited to 'src/jarabe/model/network.py')
0 files changed, 0 insertions, 0 deletions