diff options
| author | Hans Bolinder <[email protected]> | 2013-04-09 08:35:59 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2013-04-09 08:35:59 +0200 |
| commit | 34398384009f607779c05956391961e37a0f71fb (patch) | |
| tree | e1b97e0d90de04194b6ba64c5d576ac576ba7f29 | |
| parent | 4fb256d26b9213911d0f93db00ba89aecf595178 (diff) | |
| parent | 79ae0754395388baeac38868a419bc69597105c7 (diff) | |
| download | otp-34398384009f607779c05956391961e37a0f71fb.tar.gz otp-34398384009f607779c05956391961e37a0f71fb.tar.bz2 otp-34398384009f607779c05956391961e37a0f71fb.zip | |
Merge branch 'maint'
* maint:
Ignore JPG files
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 5804e36f9c..a3e03dc46f 100644 --- a/.gitignore +++ b/.gitignore @@ -155,6 +155,7 @@ JAVADOC-GENERATED /lib/*/doc/html/*.css /lib/*/doc/html/js /lib/*/doc/html/*.gif +/lib/*/doc/html/*.jpg /lib/*/doc/html/*.png /lib/*/doc/html/*.eix /lib/*/doc/man[0-9]/*.[0-9] @@ -212,7 +213,7 @@ JAVADOC-GENERATED # debugger -/lib/debugger/doc/html/images/*.gif +/lib/debugger/doc/html/images/*.jpg # edoc @@ -224,6 +225,7 @@ JAVADOC-GENERATED /erts/info /erts/doc/html/*.html /erts/doc/html/*.gif +/erts/doc/html/*.jpg /erts/doc/html/*.eix /erts/doc/pdf/*.fo /erts/doc/pdf/*.pdf @@ -329,6 +331,7 @@ JAVADOC-GENERATED /system/doc/html/js /system/doc/html/*/*.html /system/doc/html/*/*.gif +/system/doc/html/*/*.jpg /system/doc/html/*/*.eix /system/doc/top/PR.template /system/doc/top/erlresolvelinks.js |