diff options
| author | Gustav Simonsson <[email protected]> | 2012-04-13 11:03:38 +0200 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-04-13 11:03:38 +0200 |
| commit | 7e79e3bc8d3ebbb61b09865c51e96ac3290c899b (patch) | |
| tree | 79e491f39d73cf47d9ba176d89d3090fb0e7945d | |
| parent | aa793b997358cdcece802b10d0bdfd85f2568981 (diff) | |
| parent | b94070e8e7648273f097cb036764dba2fe51ddf7 (diff) | |
| download | otp-7e79e3bc8d3ebbb61b09865c51e96ac3290c899b.tar.gz otp-7e79e3bc8d3ebbb61b09865c51e96ac3290c899b.tar.bz2 otp-7e79e3bc8d3ebbb61b09865c51e96ac3290c899b.zip | |
Merge branch 'maint'
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | lib/eldap/.gitignore | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 46a47febcb..e639bacd85 100644 --- a/.gitignore +++ b/.gitignore @@ -119,6 +119,7 @@ JAVADOC-GENERATED /bootstrap/lib/syntax_tools /bootstrap/lib/test_server /bootstrap/lib/wx +/bootstrap/lib/xmerl /Makefile /configure diff --git a/lib/eldap/.gitignore b/lib/eldap/.gitignore index 5585418186..d3dd8228d5 100644 --- a/lib/eldap/.gitignore +++ b/lib/eldap/.gitignore @@ -1,4 +1,4 @@ *.beam *.asn1db -src/ELDAPv3.hrl -src/ELDAPv3.erl +ebin/ELDAPv3.hrl +ebin/ELDAPv3.erl |