diff options
| author | Lukas Larsson <[email protected]> | 2012-06-01 10:53:19 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-06-01 10:53:19 +0200 |
| commit | 4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0 (patch) | |
| tree | aa4c8c4fb80ad16b3185d94dc0a972b17fe1082d /.gitignore | |
| parent | 523516d049cd246fd68f5ec69c56fd4d5b8172f5 (diff) | |
| parent | b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6 (diff) | |
| download | otp-4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0.tar.gz otp-4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0.tar.bz2 otp-4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0.zip | |
Merge branch 'maint'
* maint:
Ignore calls to wx* modules if it is undefined
Fix erl_interface testcases
Update gccifier to respect -link option
Extand timetrap for escript tests
Fix compilation issues on windows and Ubuntu 12.04
Ignore common_test bootstrap
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e639bacd85..0986bb6e4c 100644 --- a/.gitignore +++ b/.gitignore @@ -110,6 +110,7 @@ JAVADOC-GENERATED !/bootstrap/bin/*.boot /bootstrap/lib/asn1 +/bootstrap/lib/common_test /bootstrap/lib/hipe /bootstrap/lib/ic /bootstrap/lib/orber |