• Yann Diorcet's avatar
    Merge branch 'upnp' · 5c939acd
    Yann Diorcet authored
    Conflicts:
    	coreapi/callbacks.c
    	coreapi/linphonecore.c
    	gtk/Makefile.am
    	mediastreamer2
    5c939acd