diff options
author | Siri Hansen <[email protected]> | 2018-01-09 12:31:36 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2018-01-09 12:31:36 +0100 |
commit | 8eeaa775a218ce8b74a59cace2f6b3d31f323b0b (patch) | |
tree | 193f7683f600e827288a6991325e6b80523a6104 /lib | |
parent | fbb7474e654225ad362168d08118c163976ad450 (diff) | |
parent | 276117e6322bb7cc299c9e22beec0016a32f7806 (diff) | |
download | otp-8eeaa775a218ce8b74a59cace2f6b3d31f323b0b.tar.gz otp-8eeaa775a218ce8b74a59cace2f6b3d31f323b0b.tar.bz2 otp-8eeaa775a218ce8b74a59cace2f6b3d31f323b0b.zip |
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r-- | lib/observer/include/etop.hrl | 2 | ||||
-rw-r--r-- | lib/observer/src/observer_pro_wx.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/observer/include/etop.hrl b/lib/observer/include/etop.hrl index 002937e522..f8d370450b 100644 --- a/lib/observer/include/etop.hrl +++ b/lib/observer/include/etop.hrl @@ -18,4 +18,4 @@ %% %CopyrightEnd% %% --include("../../runtime_tools/include/observer_backend.hrl"). +-include_lib("runtime_tools/include/observer_backend.hrl"). diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl index 2e5fe0bc1a..d612e0a1c5 100644 --- a/lib/observer/src/observer_pro_wx.erl +++ b/lib/observer/src/observer_pro_wx.erl @@ -27,7 +27,7 @@ handle_event/2, handle_cast/2]). -include_lib("wx/include/wx.hrl"). --include("../include/etop.hrl"). +-include("etop.hrl"). -include("observer_defs.hrl"). -include("etop_defs.hrl"). |