]> sjero.net Git - linphone/commit
Merge branch 'master' of git.linphone.org:linphone into dev_gtk_new_ui
authorMargaux Clerc <margaux.clerc@belledonne-communications>
Fri, 14 Dec 2012 15:36:15 +0000 (16:36 +0100)
committerMargaux Clerc <margaux.clerc@belledonne-communications>
Fri, 14 Dec 2012 15:36:15 +0000 (16:36 +0100)
commitbeb2d66e21d2b939e221f8ae2043ab8dfec97681
tree3c752fadf48f4f45228dfc97738a0789715cded3
parente9d61a3e4d37870c96aae277ea93e33844362994
parent30e8bf54b81adb7e99cd5bf012c4ab63fdb8a884
Merge branch 'master' of git.linphone.org:linphone into dev_gtk_new_ui

Conflicts:
gtk/parameters.ui
gtk/main.c
gtk/parameters.ui