[Commit-gnuradio] [gnuradio] 07/08: Merge remote-tracking branch 'tracierenea/ctrlport_doc' into maint

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit ffad6b12c290a6b5aa2ca70a375e28f552bbef00
Merge: 0341203 0759dbf
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 5 14:25:03 2016 -0700

    Merge remote-tracking branch 'tracierenea/ctrlport_doc' into maint

 docs/doxygen/other/ctrlport.dox | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)