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 /.gitignore | |
parent | aa793b997358cdcece802b10d0bdfd85f2568981 (diff) | |
parent | b94070e8e7648273f097cb036764dba2fe51ddf7 (diff) | |
download | otp-7e79e3bc8d3ebbb61b09865c51e96ac3290c899b.tar.gz otp-7e79e3bc8d3ebbb61b09865c51e96ac3290c899b.tar.bz2 otp-7e79e3bc8d3ebbb61b09865c51e96ac3290c899b.zip |
Merge branch 'maint'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 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 |