winlin c2ef779523 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release		2015-07-16 17:31:31 +08:00
..
app	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-07-16 17:31:31 +08:00
core	for #441, use 30s timeout for first msg. 2.0.178	2015-07-16 17:30:27 +08:00
kernel	for #441, use 30s timeout for first msg. 2.0.178	2015-07-16 17:30:27 +08:00
libs	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
main	merge srs_app_st_socket to srs_app_st.	2015-06-14 08:43:38 +08:00
protocol	extract http static and http stream from http conn.	2015-06-14 14:06:39 +08:00
utest	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00