Merge commit 'v0.89.3' into upstream
Showing
- configure.ac 2 additions, 2 deletionsconfigure.ac
- data/sugar.schemas.in 14 additions, 0 deletionsdata/sugar.schemas.in
- extensions/cpsection/aboutcomputer/view.py 5 additions, 2 deletionsextensions/cpsection/aboutcomputer/view.py
- extensions/cpsection/aboutme/view.py 191 additions, 66 deletionsextensions/cpsection/aboutme/view.py
- extensions/deviceicon/Makefile.am 1 addition, 0 deletionsextensions/deviceicon/Makefile.am
- extensions/deviceicon/network.py 100 additions, 138 deletionsextensions/deviceicon/network.py
- extensions/deviceicon/touchpad.py 132 additions, 0 deletionsextensions/deviceicon/touchpad.py
- po/POTFILES.in 1 addition, 0 deletionspo/POTFILES.in
- po/fr.po 270 additions, 197 deletionspo/fr.po
- po/nl.po 426 additions, 258 deletionspo/nl.po
- src/jarabe/desktop/meshbox.py 264 additions, 42 deletionssrc/jarabe/desktop/meshbox.py
- src/jarabe/desktop/schoolserver.py 1 addition, 1 deletionsrc/jarabe/desktop/schoolserver.py
- src/jarabe/frame/activitiestray.py 6 additions, 5 deletionssrc/jarabe/frame/activitiestray.py
- src/jarabe/journal/journalactivity.py 12 additions, 0 deletionssrc/jarabe/journal/journalactivity.py
- src/jarabe/journal/palettes.py 0 additions, 5 deletionssrc/jarabe/journal/palettes.py
- src/jarabe/journal/volumestoolbar.py 28 additions, 2 deletionssrc/jarabe/journal/volumestoolbar.py
- src/jarabe/model/Makefile.am 1 addition, 0 deletionssrc/jarabe/model/Makefile.am
- src/jarabe/model/adhoc.py 292 additions, 0 deletionssrc/jarabe/model/adhoc.py
- src/jarabe/model/bundleregistry.py 13 additions, 3 deletionssrc/jarabe/model/bundleregistry.py
- src/jarabe/model/network.py 42 additions, 1 deletionsrc/jarabe/model/network.py
Loading
Please register or sign in to comment