aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/Makefile
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-08-29 15:22:10 +0200
committerSiri Hansen <[email protected]>2012-08-29 15:22:10 +0200
commit626d52cee20f512e3fdbbe9a832be446dd70af25 (patch)
treeafbdd87d840f7cd5b519b82dc0d505006868a014 /lib/orber/Makefile
parent0080be4a20c094ef45dde842ace64f16d5dc22b2 (diff)
parente34d97ce624b368365f8bee3f34de9f5c834edfb (diff)
downloadotp-626d52cee20f512e3fdbbe9a832be446dd70af25.tar.gz
otp-626d52cee20f512e3fdbbe9a832be446dd70af25.tar.bz2
otp-626d52cee20f512e3fdbbe9a832be446dd70af25.zip
Merge branch 'siri/common_test/ct_netconfc/OTP-10025' into maint
* siri/common_test/ct_netconfc/OTP-10025: [common_test] Change server address from localhost to 127.0.0.1 in netconf config [common_test] Fix timing dependent bugs in test for ct_netconfc
Diffstat (limited to 'lib/orber/Makefile')
0 files changed, 0 insertions, 0 deletions