-
Simon Morlat authored
Conflicts: include/belle-sip/Makefile.am include/belle-sip/belle-sip.h src/Makefile.am src/belle_sip_internal.h
644c537c
Conflicts: include/belle-sip/Makefile.am include/belle-sip/belle-sip.h src/Makefile.am src/belle_sip_internal.h