aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-05-30 17:23:37 +0200
committerFredrik Gustafsson <[email protected]>2013-05-30 17:23:37 +0200
commit9427db3cd66f840ade9649513d914271b0981bf4 (patch)
tree62326e281a511c0f8d4d51a5e8aa25d1ce86fab6 /erts/emulator
parenta218171426a8bc02e20bb9d98a4d30691c8546e0 (diff)
parentc0732f12211f2c7775c5cd86d8c2085d90edbc0b (diff)
downloadotp-9427db3cd66f840ade9649513d914271b0981bf4.tar.gz
otp-9427db3cd66f840ade9649513d914271b0981bf4.tar.bz2
otp-9427db3cd66f840ade9649513d914271b0981bf4.zip
Merge branch 'sla/odbc_in_non_standard_location/OTP-11126' into maint
* sla/odbc_in_non_standard_location/OTP-11126: Fix checking for odbc in standard locations when "with-odbc" flag present.
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions