diff options
| author | Peter Lemenkov <lemenkov@gmail.com> | 2010-11-21 10:14:03 +0300 |
|---|---|---|
| committer | Peter Lemenkov <lemenkov@gmail.com> | 2010-11-21 10:14:03 +0300 |
| commit | 888a137b82eea138331a720addd16f519e41a144 (patch) | |
| tree | 5d967a4ddea87b186c66a97451bb49743d394e54 /otp-0010-Do-not-install-VxWorks-specific-docs.patch | |
| parent | 3f9a800e4f556baeda3d5be69904a3712e80f458 (diff) | |
| parent | f6c950e5377aff409d8ad8fca0ebce556fe9180c (diff) | |
| download | erlang-888a137b82eea138331a720addd16f519e41a144.tar.gz erlang-888a137b82eea138331a720addd16f519e41a144.tar.xz erlang-888a137b82eea138331a720addd16f519e41a144.zip | |
Merge branch 'master' into f14/master
Conflicts:
erlang.spec
Diffstat (limited to 'otp-0010-Do-not-install-VxWorks-specific-docs.patch')
| -rw-r--r-- | otp-0010-Do-not-install-VxWorks-specific-docs.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/otp-0010-Do-not-install-VxWorks-specific-docs.patch b/otp-0010-Do-not-install-VxWorks-specific-docs.patch index 96540e6..6f40934 100644 --- a/otp-0010-Do-not-install-VxWorks-specific-docs.patch +++ b/otp-0010-Do-not-install-VxWorks-specific-docs.patch @@ -1,7 +1,7 @@ From 659867f485cea9959b7641bd0f83d290759a7170 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov <lemenkov@gmail.com> Date: Sat, 19 Jun 2010 11:26:04 +0400 -Subject: [PATCH 10/12] Do not install VxWorks-specific docs +Subject: [PATCH 10/13] Do not install VxWorks-specific docs Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> --- @@ -21,5 +21,5 @@ index be99288..4bb07c4 100644 erl_prim_loader.xml \ erlang.xml \ -- -1.7.2.3 +1.7.3.2 |