diff options
author | Erlang/OTP <[email protected]> | 2010-03-25 14:32:11 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-03-25 14:32:11 +0000 |
commit | 8b34c68c916219f7c93e6cc9bb6b5f42e4bc66e6 (patch) | |
tree | 944e1f728d33b55402ab5093540fc2ff11a70fa7 /lib/wx/src/wxe_master.erl | |
parent | 7ffd0736fa636a871b39412ab037d7fb1ed04cf1 (diff) | |
parent | 5e454b3d8ea3bf14db3afd44c34964de21770ecb (diff) | |
download | otp-8b34c68c916219f7c93e6cc9bb6b5f42e4bc66e6.tar.gz otp-8b34c68c916219f7c93e6cc9bb6b5f42e4bc66e6.tar.bz2 otp-8b34c68c916219f7c93e6cc9bb6b5f42e4bc66e6.zip |
Merge branch 'hawk/wx-add-app-file' into dev
* hawk/wx-add-app-file:
Add app and appup files to the wx application
OTP-8538 hawk/wx-add-app-file
Diffstat (limited to 'lib/wx/src/wxe_master.erl')
-rw-r--r-- | lib/wx/src/wxe_master.erl | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/wx/src/wxe_master.erl b/lib/wx/src/wxe_master.erl index 70872775fb..5ab76a77cf 100644 --- a/lib/wx/src/wxe_master.erl +++ b/lib/wx/src/wxe_master.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2008-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %%%------------------------------------------------------------------- %%% File : wxe_server.erl @@ -33,7 +33,6 @@ %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --compile(export_all). -record(state, {cb_port, %% Callback port and to erlang messages goes via it. users, %% List of wx servers, needed ?? |