Merge branch 'scheduler_cleanup'
authorHenning Rogge <hrogge@googlemail.com>
Thu, 17 Mar 2011 11:57:29 +0000 (12:57 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Thu, 17 Mar 2011 11:57:29 +0000 (12:57 +0100)
1  2 
lib/mdns/src/NetworkInterfaces.c
src/common/avl.h
src/olsr_callbacks.c
src/olsr_comport_http.c
src/olsr_comport_txt.c
src/plugin_loader.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge