diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-02-01 10:30:29 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-05 09:20:20 +0000 |
| commit | a0059ebbb52c659282e355664bba1a2fa282170e (patch) | |
| tree | b77b27f7016a31d937a0e75e3fc59497f753eabf /meta/recipes-connectivity/wireless-tools | |
| parent | 460071785c58de6d45698046e70f1121438537cd (diff) | |
| download | openembedded-core-a0059ebbb52c659282e355664bba1a2fa282170e.tar.gz openembedded-core-a0059ebbb52c659282e355664bba1a2fa282170e.tar.bz2 openembedded-core-a0059ebbb52c659282e355664bba1a2fa282170e.zip | |
kern-tools: re-enable scc merge command
The ability to merge two branches directly from a .scc file was
dropped during the streamlining of the tools.
As was pointed out by David Vincent <freesilicon@gmail.com>, there is
once again a valid use case for this functionality, so we restore the
capability.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/wireless-tools')
0 files changed, 0 insertions, 0 deletions