]> granicus.if.org Git - esp-idf/commit
Merge branch 'bugfix/intrrupt_num_conflict' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Thu, 15 Jun 2017 12:45:57 +0000 (20:45 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Thu, 15 Jun 2017 12:45:57 +0000 (20:45 +0800)
commitfe1f8a25b5feff39c9d0d8a31886ee64a6d658f6
tree0190087ac87c364ffd552e79232fb959c4022302
parentfd12a6c70667b919927a9e66df809e526d57f47b
parent09f7cf45ddd9c7433a0ac8f5834eeafe8502b0a3
Merge branch 'bugfix/intrrupt_num_conflict' into 'master'

component/bt : fix interrupt number conflict

See merge request !878