Guillaume Roguez f692c62df4 Merge remote-tracking branch 'origin/master' into video_mixing ...

Conflicts:
	daemon/src/sflthread.h
	daemon/src/video/video_preview.h
	daemon/src/video/video_scaler.h
	daemon/src/video/video_send_thread.cpp

2013-09-01 23:11:17 -04:00

..

asterisk

#7460: Add certificates for secure calling tests

2012-05-01 16:40:20 -04:00

build-system

* #27727: rpm: removed duplicate entry

2013-08-15 10:41:02 -04:00

mozilla-telify-sflphone

* #8542: removed trailing whitespace from tree

2012-02-03 13:14:02 -05:00

pysflphone

* #14850: pysflphone: fix import

2012-09-10 17:21:04 -04:00

sippxml

#9621: Implement conference functional tests

2012-04-15 10:27:51 -04:00

vm

* #8542: removed trailing whitespace from tree

2012-02-03 13:14:02 -05:00

.gitignore

git: #6698 split the main .gitignore file

2011-08-19 19:36:10 -04:00

sflphone-callto

* #8542: removed trailing whitespace from tree

2012-02-03 13:14:02 -05:00

update-copyright

Merge remote-tracking branch 'origin/master' into video_mixing

2013-09-01 23:11:17 -04:00