| commit | 928a34246e5aa378ff4cdf3482611e64cbbb9a82 | |
| author | Thomas Jarosch <tomj@simonv.com> | |
| Thu, 24 Feb 2011 23:49:17 +0000 (25 00:49 +0100) | ||
| committer | Thomas Jarosch <tomj@simonv.com> | |
| Thu, 24 Feb 2011 23:49:17 +0000 (25 00:49 +0100) | ||
| tree | 6c32fb642ae89e824cd7c01460383e60ffe71b5e | treesnapshot (tar.gz zip) |
| parent | c64c5276794ac65ce6ee1b300a8178ec1e14f695 | commitdiff |
| parent | 61978eff82c9daba4538b6c9ca159defeba96394 | commitdiff |
Merge branch 'master' into pandora-port
Conflicts:
apps/plugins/SOURCES.app_build
apps/plugins/plugins.make
Conflicts:
apps/plugins/SOURCES.app_build
apps/plugins/plugins.make
| firmware/export/config/application.h | diff1 | diff2 | blobhistory |