diff options
| author | Erlang/OTP <[email protected]> | 2010-04-09 13:08:23 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-09 13:08:23 +0000 |
| commit | 1cc687bc328d128c513738866136e62d99c4089a (patch) | |
| tree | 955d90530f9aafec3deba82f224feaa077daeeea /erts/doc/src/Makefile | |
| parent | e44595eab24f92fe33d1feea44e422bcb7c53824 (diff) | |
| parent | f265f7dc9d519d879062b124db7cd7652690ed2d (diff) | |
| download | otp-1cc687bc328d128c513738866136e62d99c4089a.tar.gz otp-1cc687bc328d128c513738866136e62d99c4089a.tar.bz2 otp-1cc687bc328d128c513738866136e62d99c4089a.zip | |
Merge branch 'ta/nif-documentation' into dev
* ta/nif-documentation:
Fix typos in erl_nif.xml
Build erl_nif manpage
OTP-8558 ta/nif-documentation
Diffstat (limited to 'erts/doc/src/Makefile')
| -rw-r--r-- | erts/doc/src/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile index 3dfefa2001..6578923fe1 100644 --- a/erts/doc/src/Makefile +++ b/erts/doc/src/Makefile @@ -1,19 +1,19 @@ # # %CopyrightBegin% -# -# Copyright Ericsson AB 1997-2009. All Rights Reserved. -# +# +# Copyright Ericsson AB 1997-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% # include $(ERL_TOP)/make/target.mk @@ -45,6 +45,7 @@ XML_REF1_FILES = epmd.xml \ XML_REF3_FILES = \ driver_entry.xml \ + erl_nif.xml \ erl_set_memory_block.xml \ erl_driver.xml \ erl_prim_loader.xml \ |