| commit | 72972f4bb54dd7650da6f73aab42da39cda316f3 | [log] [tgz] |
|---|---|---|
| author | Laurent Delaigue <laurent.delaigue@obeo.fr> | Mon Oct 24 17:40:47 2016 +0200 |
| committer | Laurent Delaigue <laurent.delaigue@obeo.fr> | Mon Oct 24 17:40:47 2016 +0200 |
| tree | fa804dc8588ec647dc5de44a0f8db12d60079717 | |
| parent | 14123b883ed31ca999c92a153cd9ba4a01672212 [diff] | |
| parent | e23418ba774fcdfbf97e13edc7e9bf4119b17231 [diff] |
Merge branch 'master' into 3.3 Change-Id: I9ed00ead81d6c4685835b93c8eb2623751bfe7fb Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>