Code

Fix python variant of merge_config#5417

Code

Closed

nashif wants to merge 3 commits intozephyrproject-rtos:masterzephyrproject-rtos/zephyr:masterfrom nashif:merge_Config_fixnashif/zephyr:merge_Config_fixCopy head branch name to clipboard

+74-34

Commits

Commits on Dec 19, 2017

• kconfig: use merge_config.py for merging

  Show description for 7cbac50
  nashif

  committed
  7cbac50

  Copy full SHA for 7cbac50

Commits on Dec 20, 2017

• merge_config: Rewrite merge_config.py

  Show description for f4a357a
  SebastianBoe

  committed
  f4a357a

  Copy full SHA for f4a357a

• Merge pull request #2 from SebastianBoe/merge_config_rework

  Show description for f7c10fd
  

  Anas Nashif

  authored
  f7c10fd

  Copy full SHA for f7c10fd