Merge branch '2.0release' into develop

Browse source

...

This commit is contained in:

winlin 2015-07-08 17:45:08 +08:00

parent 210d0a67cb 0aed408855

commit 3dadad2dbc

8 changed files with 818 additions and 818 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files

0

trunk/src/app/srs_app_edge.cpp Executable file → Normal file

Unescape Escape View file

0

trunk/src/app/srs_app_edge.hpp Executable file → Normal file

Unescape Escape View file

0

trunk/src/app/srs_app_rtmp_conn.cpp Executable file → Normal file

Unescape Escape View file

0

trunk/src/app/srs_app_rtmp_conn.hpp Executable file → Normal file

Unescape Escape View file

0

trunk/src/app/srs_app_source.cpp Executable file → Normal file

Unescape Escape View file

0

trunk/src/app/srs_app_source.hpp Executable file → Normal file

Unescape Escape View file