diff options
| author | Raimo Niskanen <[email protected]> | 2012-01-25 14:16:27 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-01-25 14:16:27 +0100 |
| commit | 1436244c50e214c3de656c52022881bc8a27ca37 (patch) | |
| tree | 2bc886b715b73d5f206fd11760f1306ee88a12c9 /erts/emulator/zlib/Makefile | |
| parent | 9a83661c8f3e041f79d7f497fb390b4496a9577b (diff) | |
| parent | 020953c6080a538c0c3152b92a3ab125f258280b (diff) | |
| download | otp-1436244c50e214c3de656c52022881bc8a27ca37.tar.gz otp-1436244c50e214c3de656c52022881bc8a27ca37.tar.bz2 otp-1436244c50e214c3de656c52022881bc8a27ca37.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/zlib/Makefile')
| -rw-r--r-- | erts/emulator/zlib/Makefile | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/erts/emulator/zlib/Makefile b/erts/emulator/zlib/Makefile deleted file mode 100644 index def8e1aa47..0000000000 --- a/erts/emulator/zlib/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# -# %CopyrightBegin% -# -# Copyright Ericsson AB 1997-2009. 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% -# -# -# Invoke with GNU make or clearmake -C gnu. -# - -include $(ERL_TOP)/make/run_make.mk |