]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd12a6c 09f7cf4)
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)
component/bt : fix interrupt number conflict

See merge request !878


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.