Commit graph

6 commits

Author SHA1 Message Date
Simon Morlat
4e721e8a4f Merge branch 'master' into dev_sal
Conflicts:
	console/commands.c
2010-02-12 18:15:19 +01:00
Simon Morlat
01cd17d3c6 fix crash in log window after it is closed by the user. 2010-02-12 12:15:58 +01:00
Simon Morlat
7721c8c680 optimize logging to file. 2010-02-12 12:01:39 +01:00
Simon Morlat
7a8382929e Merge branch 'master' into dev_sal
Conflicts:
	coreapi/authentication.c
	coreapi/linphonecore.h
	coreapi/misc.c
	coreapi/proxy.c
2010-02-12 11:48:08 +01:00
Simon Morlat
74e2374984 merge patch for file logs. 2010-02-08 15:17:38 +01:00
Simon Morlat
999d216d7c purge out p2pproxy 2010-01-20 15:44:30 +01:00
Renamed from linphone/gtk-glade/logging.c (Browse further)