Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added the new toolbarHEADmasterakashg16112010-06-242-18/+145
| | | | | | The new toolbar is added such that the activity falls back to older toolbar in case of older sugar version, hence maintaing backward compatibility.
* Fixed a conflict case I missed.Gary Martin2010-06-171-27/+25
|
* Merged and manualy fixed conflict.Gary Martin2010-06-171-14/+36
|\
| * Grab now works even if the simulation is paused.Peter Froehlich2010-06-131-4/+20
| |
* | Merge branch 'master' of git://git.sugarlabs.org/physics/Craigs-cloneGary Martin2010-06-151-25/+11
|\ \
| * |