]> sjero.net Git - linphone/commit - gtk/parameters.ui
Merge branch 'master' of git://git.sv.gnu.org/linphone
authorSylvain Berfini <Sylvain.Berfini@belledonne-communications.com>
Thu, 22 Sep 2011 14:29:53 +0000 (16:29 +0200)
committerSylvain Berfini <Sylvain.Berfini@belledonne-communications.com>
Thu, 22 Sep 2011 14:29:53 +0000 (16:29 +0200)
commit615dd1cb3913afba43a71fa5a913c284d241dbd5
tree13636302f1a5a5b71b1ce8fd351e59c43a91f4f9
parent0ca32414559e0377973f10afc2c01316b1ce5710
parent73acd25082b213ba0ce6cd77cecd736b34b4bdc2
Merge branch 'master' of git://git.sv.gnu.org/linphone