Merge remote-tracking branch 'origin/master' into gsoc-sagar-watercycle
Description
Description
Details
Details
- Committed
scagarwal Aug 9 2015, 11:55 AM - Parents
- R2:64c2ce29b508: watercycle, added string and extra text option
R2:1d821ed54bc6: babyshape activities, set demo to true - Branches
- Unknown
- Tags
- References
- refs/backups/branch-gsoc-sagar-watercycle-1439124821
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 1d821ed54bc6 | jjazeix | babyshape activities, set demo to true | Aug 8 2015 | |||
| dc87b98d5ed8 | bcoudoin | ballcatch, hide tux when the bonus is running | Aug 8 2015 | |||
| 5468f101d3a2 | bcoudoin | core, bonus add a start/stop signal | Aug 8 2015 | |||
| fd09f10fa126 | bcoudoin | core, bonus now scales the image without loss | Aug 8 2015 | |||
| 8ceb64bbdbf2 | bcoudoin | gletters, fix missing letter in dutch | Aug 8 2015 |