Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into tree-22

Browse source

Conflicts:
	pdf.js

...

This commit is contained in:

notmasteryet 2011-09-21 20:00:35 -05:00

parent 2248690d11 eb592e09e4

commit ed21c8590c

1 changed files with 232 additions and 211 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

443

pdf.js

View file

File diff suppressed because it is too large Load diff