diff options
| author | Patrik Nyblom <[email protected]> | 2013-02-22 15:59:04 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-02-22 15:59:04 +0100 |
| commit | 50fb07d0a45bef458830f0ee470237e36acb7f5b (patch) | |
| tree | 516fe3c5a99a20aafde19e464eda147a22400764 /.gitignore | |
| parent | 2ff92dc7c2aa5c052df47776b782500815ce72eb (diff) | |
| parent | 0937c5e52c0298f0cdba96565556b9fd2f43dd2c (diff) | |
| download | otp-50fb07d0a45bef458830f0ee470237e36acb7f5b.tar.gz otp-50fb07d0a45bef458830f0ee470237e36acb7f5b.tar.bz2 otp-50fb07d0a45bef458830f0ee470237e36acb7f5b.zip | |
Merge branch 'pan/unicode_users_guide/r16b'
* pan/unicode_users_guide/r16b:
Update .gitignore
Correct text according to document reviews
Adapt the Unicode chapter of STDLIB users guide to R16
OTP-10302
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e5e74f9a3d..5804e36f9c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ autom4te.cache i686-pc-linux-gnu x86_64-unknown-linux-gnu i386-apple-darwin[0-9]*.[0-9]*.[0-9]* +x86_64-apple-darwin[0-9]*.[0-9]*.[0-9]* sparc-sun-solaris[0-9]*.[0-9]* i386-pc-solaris[0-9]*.[0-9]* i386-unknown-freebsd[0-9]*.[0-9]* @@ -151,7 +152,10 @@ JAVADOC-GENERATED /lib/*/SKIP /lib/*/doc/html/*.html +/lib/*/doc/html/*.css +/lib/*/doc/html/js /lib/*/doc/html/*.gif +/lib/*/doc/html/*.png /lib/*/doc/html/*.eix /lib/*/doc/man[0-9]/*.[0-9] /lib/*/doc/pdf/*.fo |