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

This commit is contained in:
Yann Diorcet 2012-05-31 13:02:28 +02:00
commit 5a1a999f04
2 changed files with 2 additions and 2 deletions

View file

@ -20,7 +20,7 @@
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Linphone - Configure a SIP account</property>
<property name="title" translatable="yes">Configure VoIP tunnel</property>
<property name="window_position">center-on-parent</property>
<property name="icon">linphone2.png</property>
<property name="type_hint">dialog</property>

@ -1 +1 @@
Subproject commit 7fe1c91afdd73a48fcf62884fd697cba6e61141f
Subproject commit 8fb5d72cf1ecc1c30c29fc4ba093b9bade74ba6a