diff options
| author | Simon Marchetto <simon.marchetto@scilab-enterprises.com> | 2015-01-26 10:50:20 +0100 |
|---|---|---|
| committer | Simon Marchetto <simon.marchetto@scilab-enterprises.com> | 2015-01-26 10:50:20 +0100 |
| commit | adc4b788dfe014cbbcafd175fe0e84df04fb5a54 (patch) | |
| tree | a682c279a3f1882a6db7563567eb4edd2103ad61 /.gitignore | |
| parent | 6f48e570900291a0752e22b9c5e1fa692da7b87c (diff) | |
| parent | 8fe85e764f52f0f62377ef34148dcba25b968506 (diff) | |
| download | swig-adc4b788dfe014cbbcafd175fe0e84df04fb5a54.tar.gz | |
Merge remote-tracking branch 'origin/master' into gsoc2012-scilab
Conflicts:
.gitignore
.travis.yml
configure.ac
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 5ca7dac0d..78b72338f 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,7 @@ CCache/config.h CCache/config.log CCache/config.status Examples/Makefile +Examples/d/example.mk Examples/guile/Makefile Examples/test-suite/*/Makefile Examples/xml/Makefile @@ -137,6 +138,7 @@ Examples/test-suite/uffi/*/ # Octave generated files swigexample*.oct +Examples/test-suite/octave/*.oct # Python generated files, based on: # https://github.com/github/gitignore/blob/master/Python.gitignore @@ -145,10 +147,11 @@ swigexample*.oct /__pycache__/ # Scilab generated files -builder.sce loader.sce -cleaner.sce -gw_*.c + +# Go generated files +*.[5689] +*_gc.c # Scratch directories Examples/scratch |