otp.git/lib/megaco/src/flex, branch dgud-string-depr Mirror of Erlang/OTP repository. update copyright-year 2016-03-15T14:19:56+00:00 Henrik Nord henrik@erlang.org 2016-03-15T14:19:56+00:00 6664eed554974336909d3ffe03f20349cc4c38fd 






Change license text to APLv2
2015-06-18T09:31:02+00:00

Bruce Yinhe
bruce@erlang.org

2015-06-18T09:31:02+00:00

738c34d4bb8f1a3811acd00af8c6c12107f8315b












Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r15' into bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r16
2013-04-19T15:39:51+00:00

Micael Karlberg
bmk@erlang.org

2013-04-19T15:39:51+00:00

8613f8153a639ea88edeb9f7d89270072e8c2d8a

Conflicts:
	lib/megaco/doc/src/notes.xml
	lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
	lib/megaco/test/megaco_codec_prev3a_test.erl
	lib/megaco/test/megaco_codec_prev3b_test.erl
	lib/megaco/test/megaco_codec_prev3c_test.erl
	lib/megaco/test/megaco_codec_v1_test.erl
	lib/megaco/test/megaco_codec_v2_test.erl
	lib/megaco/test/megaco_codec_v3_test.erl
	lib/megaco/vsn.mk





Conflicts:
	lib/megaco/doc/src/notes.xml
	lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
	lib/megaco/test/megaco_codec_prev3a_test.erl
	lib/megaco/test/megaco_codec_prev3b_test.erl
	lib/megaco/test/megaco_codec_prev3c_test.erl
	lib/megaco/test/megaco_codec_v1_test.erl
	lib/megaco/test/megaco_codec_v2_test.erl
	lib/megaco/test/megaco_codec_v3_test.erl
	lib/megaco/vsn.mk







Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14' into bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r15
2013-04-18T12:48:35+00:00

Micael Karlberg
bmk@erlang.org

2013-04-18T12:48:35+00:00

0c0677a913d10b87dd4faa3fc932506f98adcc45

[megaco] Fixed felx driver handler code-change tags.





[megaco] Fixed felx driver handler code-change tags.







Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r13' into bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14
2013-04-18T11:40:43+00:00

Micael Karlberg
bmk@erlang.org

2013-04-18T11:40:43+00:00

d7b7a545ab88088e53e632f2a24824861b60ec48

Fixed flex handler code-change version tag.





Fixed flex handler code-change version tag.







[megaco] Used wrong downgrade tag for (flex) handler
2013-04-18T09:53:47+00:00

Micael Karlberg
bmk@erlang.org

2013-04-18T09:53:47+00:00

46d8a5961ba734fa4d5d198c481d34aad65c35e5












[megaco] Fix merge
2013-04-17T12:37:10+00:00

Micael Karlberg
bmk@erlang.org

2013-04-17T12:37:10+00:00

1dcfcb31c8d5f0f23e0b836ea0aa85277c71ee17












Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14' into bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r15
2013-04-17T12:19:29+00:00

Micael Karlberg
bmk@erlang.org

2013-04-17T12:19:29+00:00

10ca34488869c17cbd2d1a14ede4f4a8af67726e

Conflicts:
	lib/megaco/.gitignore
	lib/megaco/doc/src/notes.xml
	lib/megaco/src/app/megaco.appup.src
	lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
	lib/megaco/test/megaco_codec_v2_test.erl
	lib/megaco/vsn.mk





Conflicts:
	lib/megaco/.gitignore
	lib/megaco/doc/src/notes.xml
	lib/megaco/src/app/megaco.appup.src
	lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
	lib/megaco/test/megaco_codec_v2_test.erl
	lib/megaco/vsn.mk







Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r13' into bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14
2013-04-16T13:45:16+00:00

Micael Karlberg
bmk@erlang.org

2013-04-16T13:45:16+00:00

579b659afdc9dd5a2178c5c756964ba3b56dbded

Conflicts:
	lib/megaco/doc/src/notes.xml
	lib/megaco/src/app/megaco.appup.src
	lib/megaco/test/megaco_codec_flex_lib.erl
	lib/megaco/test/megaco_codec_v2_test.erl
	lib/megaco/test/megaco_test_lib.erl
	lib/megaco/vsn.mk





Conflicts:
	lib/megaco/doc/src/notes.xml
	lib/megaco/src/app/megaco.appup.src
	lib/megaco/test/megaco_codec_flex_lib.erl
	lib/megaco/test/megaco_codec_v2_test.erl
	lib/megaco/test/megaco_test_lib.erl
	lib/megaco/vsn.mk







Assign correct version and updated release notes accordingly.
2013-04-10T08:39:40+00:00

Micael Karlberg
bmk@erlang.org

2013-04-10T08:39:40+00:00

bb7ba9f1e70a49310efc872f528d91d2a5f4f661

Also added (and cleaned up) appup.





Also added (and cleaned up) appup.