Merge branch 'master' of git.linphone.org:linphone

1a5606f1 · Simon Morlat · 7b6035f5 · f9221528 · 1a5606f1 · 1a5606f1
Commit 1a5606f1 authored 13 years ago by Simon Morlat
--- a/pausecall.png
+++ b/pausecall.png
--- a/pixmaps/pausecall.png
+++ b/pixmaps/pausecall.png
--- a/pixmaps/resumecall.png
+++ b/pixmaps/resumecall.png
--- a/resumecall.png
+++ b/resumecall.png