diff options
| author | Micael Karlberg <[email protected]> | 2011-10-20 12:47:28 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-10-20 12:47:28 +0200 |
| commit | da49021ad3323f90c95a65962b6dfff5a7b139f6 (patch) | |
| tree | e1d603168ff2a86c81980bf89cc3d4808ec20a8a /.gitignore | |
| parent | 97282ecb85d44b12a452563b0eb594404f7144e1 (diff) | |
| parent | 6ef9aef50dbe839098e4330a97247aa21a15ecde (diff) | |
| download | otp-da49021ad3323f90c95a65962b6dfff5a7b139f6.tar.gz otp-da49021ad3323f90c95a65962b6dfff5a7b139f6.tar.bz2 otp-da49021ad3323f90c95a65962b6dfff5a7b139f6.zip | |
Merge branch 'master' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e5f0869f27..e6920fbeca 100644 --- a/.gitignore +++ b/.gitignore @@ -100,6 +100,9 @@ make/win32/ # Used by ic & orber & cos* applications. IDL-GENERATED +# Used by applications that run javadoc (e.g. ic). +JAVADOC-GENERATED + # Anchored from $ERL_TOP /bin /config.log |