diff options
author | Anders Svensson <[email protected]> | 2011-08-16 17:01:45 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2011-08-16 17:01:45 +0200 |
commit | a7c0e439ee84d25ce18f65959be06315063a7de8 (patch) | |
tree | b5a54174171fdd0f10d556c8a96909eb4af7f1d6 /lib/edoc/Makefile | |
parent | 5a57f3798edd56caa61514378c673ff78ac397d2 (diff) | |
parent | 46af29aac0e851105620dab25644cf27219e2b0a (diff) | |
download | otp-a7c0e439ee84d25ce18f65959be06315063a7de8.tar.gz otp-a7c0e439ee84d25ce18f65959be06315063a7de8.tar.bz2 otp-a7c0e439ee84d25ce18f65959be06315063a7de8.zip |
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'lib/edoc/Makefile')
-rw-r--r-- | lib/edoc/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/edoc/Makefile b/lib/edoc/Makefile index e512e390e3..1add669398 100644 --- a/lib/edoc/Makefile +++ b/lib/edoc/Makefile @@ -13,8 +13,6 @@ # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings # AB. All Rights Reserved.'' # -# $Id$ -# include $(ERL_TOP)/make/target.mk include $(ERL_TOP)/make/$(TARGET)/otp.mk |