Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainlineMarion2013-07-031-4/+11
|\
| * #4528: fix turtle graphicsWalter Bender2013-07-011-4/+11
| |
* | Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainlineMarion2013-06-2972-33022/+35083
|\ \ | |/
| * Push many po filesPootle daemon2013-06-2872-33022/+35083
| |
* | Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainlineMarion2013-06-282-1/+12
|\ \ | |/
| * news for v182v182Walter Bender2013-06-232-1/+12
| |
* | Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainlineMarion2013-06-212-474/+510
|\ \ | |/ | | | | | | Conflicts: TurtleArt/tawindow.py -- accepted everything from mainline
| * parent is not activity (marion zepf)Walter Bender2013-06-212-3/+11
| |
| * Merge branch 'master' of git.sugarlabs.org:turtleart/mainlineWalter Bender2013-06-211-467/+497
| |\
| | *