胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
5f299356 1 parent b370b176

update master to 2.0, because the 1.0release branch is created. 2.0.0

内嵌 并排对比
正在显示 1 个修改的文件 包含 1 行增加 和 1 行删除
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
29 */ 29 */
30 30
31 // current release version 31 // current release version
32 -#define VERSION_MAJOR "1" 32 +#define VERSION_MAJOR "2"
33 #define VERSION_MINOR "0" 33 #define VERSION_MINOR "0"
34 #define VERSION_REVISION "0" 34 #define VERSION_REVISION "0"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION