113 commits

Author	SHA1	Message	Date
winlin	18eb8c81b3	merge from srs2	2015-11-16 18:10:06 +08:00
winlin	c77cefb6fa	refine the position of log script	2015-11-11 17:49:46 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	6c7a51d310	Merge branch '2.0release' into develop	2015-11-10 12:16:08 +08:00
winlin	1d8318d2fc	change simple-rtmp-server org to ossrs	2015-11-10 12:16:01 +08:00
winlin	d2ccc4f661	Merge branch '2.0release' into develop	2015-11-10 12:15:00 +08:00
winlin	8c04b17d08	use /usr/local/bin for osx.	2015-11-10 12:03:52 +08:00
winlin	a501f5bd7a	update htbt script	2015-10-26 14:54:41 +08:00
winlin	dd2945add1	update htbt script	2015-10-26 14:53:54 +08:00
winlin	6f6d495a19	update htbt script	2015-10-26 14:50:16 +08:00
winlin	3933819686	add htbt script	2015-10-26 14:18:19 +08:00
winlin	b5ba1043e8	Merge branch '2.0release' into develop	2015-10-08 16:07:54 +08:00
winlin	9c2eafc244	refine the git command	2015-10-08 15:53:49 +08:00
winlin	8a6edac4e8	add --x86-64 alias for --x86-x64.	2015-09-22 13:52:14 +08:00
winlin	a4f51564db	rename kernel stream to buffer	2015-09-22 08:48:55 +08:00
winlin	ac2b03a3ed	rename srs_kernel_buffer to temp	2015-09-22 08:42:54 +08:00
winlin	faf6d15878	add replace script.	2015-09-21 18:32:17 +08:00
winlin	15102a7345	refine commit script	2015-08-24 11:16:39 +08:00
winlin	a7f4104d45	fix bug of commit script	2015-08-24 11:04:39 +08:00
winlin	064031cac1	refine commit script	2015-08-24 10:59:32 +08:00
winlin	8e259eb0c2	refine the commit script	2015-08-24 10:57:12 +08:00
winlin	4118138cf0	update commit script	2015-08-24 10:54:31 +08:00
winlin	7e04975b8d	fix the test configure script	2015-05-27 11:38:10 +08:00
winlin	1150cde829	fix the verbose build failed.	2015-05-27 11:12:52 +08:00
winlin	ca01bd407b	fix the bug of test configure script.	2015-05-27 10:55:46 +08:00
winlin	eb488e3bde	fix the test configure script bug	2015-05-27 07:32:51 +08:00
winlin	02c4741d64	add usage and make jobs support for configure test script	2015-05-27 07:30:37 +08:00
winlin	9ab579c6e8	refine the configure test script.	2015-05-27 07:06:16 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	b3bd007f0d	update git commit	2015-04-29 15:09:03 +08:00
winlin	014993ad1e	remove the sudo of log.	2015-03-20 15:10:17 +08:00
winlin	ab673e1300	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	2015-03-17 22:06:59 +08:00
winlin	636bc574af	start 2.0release, 80773 lines.	2015-03-15 07:48:27 +08:00
winlin	20fb5f3e8e	modify the colorful bash for osx.	2015-03-09 23:20:12 +08:00
winlin	45724bfaec	update conf for transcode.	2015-01-03 14:46:29 +08:00
winlin	dec4f6b989	hotfix 1.0release, add remote gitlab	2014-12-26 22:45:09 +08:00
winlin	dfd4eeca45	hotfix 1.0release, git checkout develop when commit	2014-12-26 21:49:04 +08:00
winlin	0c132e9781	update the log position.	2014-11-28 10:58:16 +08:00
winlin	127b96b255	add git2unix and git commit script.	2014-11-28 10:42:47 +08:00
winlin	be53b10ed3	refine log position	2014-11-27 08:04:39 +08:00
winlin	2175102ea2	remove the sync script for mirror, which maybe updated.	2014-10-27 11:41:28 +08:00
winlin	fe59783d83	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:28:50 +08:00
winlin	6da21364f6	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:55:58 +08:00
winlin	fca500fae6	update package for pi, check the lsb_release.	2014-10-09 14:07:20 +08:00
winlin	024611cc08	update package for pi, check the lsb_release.	2014-10-09 14:06:54 +08:00
winlin	effcd89f66	refine script.	2014-10-09 12:09:01 +08:00
winlin	6468b9e92b	refine script, to disable iptables and selinux. 0.9.225	2014-10-09 12:07:56 +08:00
winlin	5e8f8ad3b9	add add hosts and wiki.	2014-10-09 11:53:59 +08:00
winlin	3fcbb60b1c	add add hosts and wiki.	2014-10-09 11:53:21 +08:00