Resolve conflicts
authorrickb44 <rickb44@01035d8c-6547-0410-b346-abe4f91aad63>
Fri, 31 Oct 2014 17:54:42 +0000 (17:54 +0000)
committerrickb44 <rickb44@01035d8c-6547-0410-b346-abe4f91aad63>
Fri, 31 Oct 2014 17:54:42 +0000 (17:54 +0000)
commitd1eb273443a6f45afe0c1f3f3e7347bc038f27d8
tree114d3ba0e6b4429e106e2c67e6ba33f5a2ce11e9
parentb94560757eec0a27da9bc1f4c6c97b47bb89e956
Resolve conflicts

git-svn-id: https://svn.code.sf.net/p/freetel/code@1922 01035d8c-6547-0410-b346-abe4f91aad63
smartmic/SM1000-C/SM1000-C.brd
smartmic/SM1000-C/SM1000-C.sch