diff options
| author | Henrik Nord <[email protected]> | 2011-08-16 15:01:22 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-16 15:01:32 +0200 |
| commit | 48d0c4adbe85450f1224311f9b8495affaae9c6a (patch) | |
| tree | b7ca1cb97b452768898094eb44ddc6b0286af214 /lib/edoc/doc/Makefile | |
| parent | f74168772f6eb7765d8cfe0ffcce58273f920bcf (diff) | |
| parent | 52e430eb1570c0cda49a8070063f1a6a2328578b (diff) | |
| download | otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.tar.gz otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.tar.bz2 otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.zip | |
Merge branch 'rc/edoc-minor' into dev
* rc/edoc-minor:
forgot to ensure that xmerl is found in path for include_lib to work
fix -spec declaration that doesn't work in R13B04
eliminate warnings about unused imports
removed CVS-keywords from source files
synchronized with edoc development version
OTP-9463
Diffstat (limited to 'lib/edoc/doc/Makefile')
| -rw-r--r-- | lib/edoc/doc/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/edoc/doc/Makefile b/lib/edoc/doc/Makefile index a0f6484382..c5f68b25d0 100644 --- a/lib/edoc/doc/Makefile +++ b/lib/edoc/doc/Makefile @@ -13,8 +13,6 @@ # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings # AB. All Rights Reserved.'' # -# $Id: Makefile,v 1.1.1.1 2004/10/04 13:53:33 richardc Exp $ -# include $(ERL_TOP)/make/target.mk include $(ERL_TOP)/make/$(TARGET)/otp.mk |