include svc_main.c in code warrrior import
Merge branch 'master' of https://github.com/skarger/sos
fix merge conflict