diff options
author | Henrik Nord <[email protected]> | 2011-09-20 10:28:00 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-09-20 10:28:13 +0200 |
commit | 7973451a3c9fbdeef47a94ed45b65b59422abe57 (patch) | |
tree | 4e8eccdbd551599b9654448aef87bea7bfc47355 /lib/odbc/src/odbc.appup.src | |
parent | deff4ce66e8d2a3697e0aa9d27211ee2f2a7e620 (diff) | |
parent | feecf39417a1a5f2114a5fc18c7e0207fb642eee (diff) | |
download | otp-7973451a3c9fbdeef47a94ed45b65b59422abe57.tar.gz otp-7973451a3c9fbdeef47a94ed45b65b59422abe57.tar.bz2 otp-7973451a3c9fbdeef47a94ed45b65b59422abe57.zip |
Merge branch 'jw/release_handler_1' into dev
* jw/release_handler_1:
General improvements to release_handler_1:get_supervised_procs
Conflicts:
lib/sasl/src/release_handler_1.erl
lib/sasl/test/release_handler_SUITE.erl
OTP-9546
Diffstat (limited to 'lib/odbc/src/odbc.appup.src')
0 files changed, 0 insertions, 0 deletions