merge from 2.0release

This commit is contained in:
winlin 2015-03-17 23:48:50 +08:00
parent 9ed0da24d3
commit df2644c850

View File

@ -32,7 +32,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define VERSION_MAJOR 3
#define VERSION_MINOR 0
#define VERSION_REVISION 0
#define VERSION_REVISION 143
// server info.
#define RTMP_SIG_SRS_KEY "SRS"