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 /.gitignore | |
| 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 '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 18a54c21ca..07b66c3e2b 100644 --- a/.gitignore +++ b/.gitignore @@ -381,6 +381,7 @@ JAVADOC-GENERATED /system/doc/installation_guide/INSTALL.xml /system/doc/installation_guide/INSTALL-CROSS.xml /system/doc/installation_guide/INSTALL-WIN32.xml +/system/doc/installation_guide/OTP-PATCH-APPLY.xml /system/doc/installation_guide/MARKDOWN.xml # test_server |