diff options
| author | Rickard Green <[email protected]> | 2015-03-17 12:11:02 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-17 12:11:02 +0100 |
| commit | 281892c5d7b7b5e1ac2402390d83287913aefd94 (patch) | |
| tree | 31958d050a5d1cad34295ecd324e4fbc470ff884 /system/doc/installation_guide/xmlfiles.mk | |
| parent | 5389ac364e76593ab436e1597fe39d93af1caf3c (diff) | |
| parent | b3e72b5969a3dd7d22e67b2484e3ba390975a034 (diff) | |
| download | otp-281892c5d7b7b5e1ac2402390d83287913aefd94.tar.gz otp-281892c5d7b7b5e1ac2402390d83287913aefd94.tar.bz2 otp-281892c5d7b7b5e1ac2402390d83287913aefd94.zip | |
Merge branch 'maint'
* maint:
Add support for patching of individual applications
Conflicts:
system/doc/installation_guide/part.xml
Diffstat (limited to 'system/doc/installation_guide/xmlfiles.mk')
| -rw-r--r-- | system/doc/installation_guide/xmlfiles.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/system/doc/installation_guide/xmlfiles.mk b/system/doc/installation_guide/xmlfiles.mk index c443334cd7..a18c82bc25 100644 --- a/system/doc/installation_guide/xmlfiles.mk +++ b/system/doc/installation_guide/xmlfiles.mk @@ -20,4 +20,5 @@ INST_GUIDE_CHAPTER_FILES = \ install-binary.xml \ INSTALL.xml \ INSTALL-CROSS.xml \ - INSTALL-WIN32.xml + INSTALL-WIN32.xml \ + OTP-PATCH-APPLY.xml |