resolved conflict by renumbering
authordrowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Thu, 11 Sep 2014 07:44:34 +0000 (07:44 +0000)
committerdrowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Thu, 11 Sep 2014 07:44:34 +0000 (07:44 +0000)
commit6057cc046b4e300e8a0f037f1420f29ae32a946b
treef0dc4467999e611129d8c46563b0c1b15e0fe1e6
parent32d1367857cc8ead176ab24956d833fd9dce1b50
resolved  conflict by renumbering

git-svn-id: https://svn.code.sf.net/p/freetel/code@1838 01035d8c-6547-0410-b346-abe4f91aad63
smartmic/SM1000-C/Change-Log-C.txt