linphone-iphone/gtk-glade
Simon Morlat 4e721e8a4f Merge branch 'master' into dev_sal
Conflicts:
	console/commands.c
2010-02-12 18:15:19 +01:00
..
.gitignore purge out p2pproxy 2010-01-20 15:44:30 +01:00
about.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
buddylookup.c purge out p2pproxy 2010-01-20 15:44:30 +01:00
buddylookup.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
call_logs.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
calllogs.c purge out p2pproxy 2010-01-20 15:44:30 +01:00
chat.c purge out p2pproxy 2010-01-20 15:44:30 +01:00
chatroom.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
contact.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
fonis.c purge out p2pproxy 2010-01-20 15:44:30 +01:00
friendlist.c ported everything to updated liblinphone api. 2010-02-08 13:07:40 +01:00
gtkrc purge out p2pproxy 2010-01-20 15:44:30 +01:00
incall_view.c purge out p2pproxy 2010-01-20 15:44:30 +01:00
incoming_call.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
linphone.h purge out p2pproxy 2010-01-20 15:44:30 +01:00
linphone.ico purge out p2pproxy 2010-01-20 15:44:30 +01:00
linphone.iss purge out p2pproxy 2010-01-20 15:44:30 +01:00
linphone.png purge out p2pproxy 2010-01-20 15:44:30 +01:00
linphone.rc purge out p2pproxy 2010-01-20 15:44:30 +01:00
linphone2.png purge out p2pproxy 2010-01-20 15:44:30 +01:00
log.glade fix crash in log window after it is closed by the user. 2010-02-12 12:15:58 +01:00
logging.c Merge branch 'master' into dev_sal 2010-02-12 18:15:19 +01:00
loginframe.c Merge branch 'master' into dev_sal 2010-02-12 11:48:08 +01:00
main.c ported everything to updated liblinphone api. 2010-02-08 13:07:40 +01:00
main.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
Makefile.am purge out p2pproxy 2010-01-20 15:44:30 +01:00
p2pwizard.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
parameters.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
password.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
propertybox.c api rationalisation of payload type. 2010-01-28 12:34:21 +01:00
setupwizard.c purge out p2pproxy 2010-01-20 15:44:30 +01:00
sip_account.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00
stock_people.png purge out p2pproxy 2010-01-20 15:44:30 +01:00
support.c purge out p2pproxy 2010-01-20 15:44:30 +01:00
update.c purge out p2pproxy 2010-01-20 15:44:30 +01:00
utils.c purge out p2pproxy 2010-01-20 15:44:30 +01:00
waiting.glade purge out p2pproxy 2010-01-20 15:44:30 +01:00