Merge branch 'master' of ssh://review.sflphone.org:29420/sflphone

Browse Source

Conflicts:
	CODING

Change-Id: Ibb438278ecb22ed238a2d80301bd7252cc1fa454

...

This commit is contained in:

Emmanuel Milou

2014-04-16 16:23:20 -04:00

parent d3afb2a961 867796256b

commit 9699edd36d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available