胡斌 / srs

27 Nov, 2014 24 commits
- merge from 1.0 hotfix. 3.0.35 · 14fca601
  14fca601 浏览文件
  
  winlin authored 2014-11-27 18:50:54 +0800
- hotfix 1.0, author bug, use error macro. 1.0.9 · 9c033c7d
  9c033c7d 浏览文件
  
  winlin authored 2014-11-27 18:48:01 +0800
- for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34 · 03f72fb1
  03f72fb1 浏览文件
  
  winlin authored 2014-11-27 18:39:02 +0800
- for bug #229, remove the windows vs2010 build files for srs-librtmp build failed on windows. · bb85a0c8
  bb85a0c8 浏览文件
  
  winlin authored 2014-11-27 18:31:25 +0800
- try to build srs-librtmp on vs2010, failed. · eb4e7aad
  eb4e7aad 浏览文件
  
  winlin authored 2014-11-27 18:20:13 +0800
- Merge branch '1.0release' · 904a06ca
  904a06ca 浏览文件
  
  winlin authored 2014-11-27 17:47:23 +0800
- hotfix to add comments on 1.0release · 575e50b6
  575e50b6 浏览文件
  
  winlin authored 2014-11-27 17:47:13 +0800
- merge from 1.0release to master(develop) · 9c0d02f6
  9c0d02f6 浏览文件
  
  winlin authored 2014-11-27 17:35:46 +0800
- Revert "remove vs2010 files from master" · 62b86171 ...
  62b86171 浏览文件
```
This reverts commit f8a2c22f.
```
  winlin authored 2014-11-27 17:02:30 +0800
- remove vs2010 files from master · f8a2c22f
  f8a2c22f 浏览文件
  
  winlin authored 2014-11-27 16:16:04 +0800
- Merge branch 'allspace-master' into srs-librtmp · b70bc748
  b70bc748 浏览文件
  
  winlin authored 2014-11-27 15:29:41 +0800
- refine merged code for allspace. · 4c0c3a9a
  4c0c3a9a 浏览文件
  
  winlin authored 2014-11-27 15:29:24 +0800
- change srs version to 2.0.33 · 46894183
  46894183 浏览文件
  
  winlin authored 2014-11-27 15:23:16 +0800
- refine code by winlin, for merged from allspace. · 18c30824
  18c30824 浏览文件
  
  winlin authored 2014-11-27 15:22:39 +0800
- merge from allspace, to srs-librtmp, for vs2010 · 1855c942
  1855c942 浏览文件
  
  winlin authored 2014-11-27 14:46:05 +0800
- checkout master · bb54194c
  bb54194c 浏览文件
  
  winlin authored 2014-11-27 12:53:21 +0800
- checkout master · 1ce79980
  1ce79980 浏览文件
  
  winlin authored 2014-11-27 12:52:47 +0800
- refine script · c49981ed
  c49981ed 浏览文件
  
  winlin authored 2014-11-27 12:51:33 +0800
- refine comments · b825ea62
  b825ea62 浏览文件
  
  winlin authored 2014-11-27 12:50:04 +0800
- add git2unix script · 8766ab5d
  8766ab5d 浏览文件
  
  winlin authored 2014-11-27 12:45:34 +0800
- refine log position · be53b10e
  be53b10e 浏览文件
  
  winlin authored 2014-11-27 08:04:39 +0800
- sleep when git commit failed. · e76c53da
  e76c53da 浏览文件
  
  winlin authored 2014-11-27 08:03:21 +0800
- fix bug of git commit · ff730880
  ff730880 浏览文件
  
  winlin authored 2014-11-27 08:02:17 +0800
- udpate github commit to git commit · 93ee15a5
  93ee15a5 浏览文件
  
  winlin authored 2014-11-27 08:00:11 +0800
26 Nov, 2014 4 commits
- sync tags with csdn and oschina · 55461e86
  55461e86 浏览文件
  
  winlin authored 2014-11-27 07:52:12 +0800
- use multiple remote to commit and sync with csdn+oschina. · 131f598a
  131f598a 浏览文件
  
  winlin authored 2014-11-27 07:47:39 +0800
- Merge branch 'srs.master' · 4c67ddca
  4c67ddca 浏览文件
  
  winlin authored 2014-11-27 07:17:11 +0800
- add github script · 6a5f405b
  6a5f405b 浏览文件
  
  winlin authored 2014-11-27 07:02:54 +0800
25 Nov, 2014 12 commits
- Merge branch 'srs.1.0release' into 1.0release · c6133213
  c6133213 浏览文件
  
  winlin authored 2014-11-25 11:12:05 +0800
- Merge branch 'srs.master' · ad8b63d2
  ad8b63d2 浏览文件
  
  winlin authored 2014-11-25 11:11:57 +0800
- udpate the srs_bwt. · d91a9dfa
  d91a9dfa 浏览文件
  
  winlin authored 2014-11-25 11:10:54 +0800
- udpate the srs_bwt. · e11fa383
  e11fa383 浏览文件
  
  winlin authored 2014-11-25 11:09:28 +0800
- Merge branch 'srs.master' · 499277a0
  499277a0 浏览文件
  
  winlin authored 2014-11-25 11:06:38 +0800
- udpate the srs_bwt. · 02778dba
  02778dba 浏览文件
  
  winlin authored 2014-11-25 11:05:45 +0800
- Merge branch 'srs.master' · cb062031
  cb062031 浏览文件
  
  winlin authored 2014-11-25 11:01:48 +0800
- udpate the srs_bwt. · a2af0518
  a2af0518 浏览文件
  
  winlin authored 2014-11-25 10:59:38 +0800
- Merge branch 'srs.1.0release' into 1.0release · 1c90b190
  1c90b190 浏览文件
  
  winlin authored 2014-11-25 10:51:28 +0800
- update PRIMARY, AUTHORS, CONTRIBUTORS rule · cd0ab5fb
  cd0ab5fb 浏览文件
  
  winlin authored 2014-11-25 10:50:59 +0800
- update PRIMARY, AUTHORS, CONTRIBUTORS rule · db7af625
  db7af625 浏览文件
  
  winlin authored 2014-11-25 10:50:25 +0800
- Merge branch 'srs.master' · 5865b30b
  5865b30b 浏览文件
  
  winlin authored 2014-11-25 10:42:33 +0800