]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'refs/heads/master' into filesplit
authorArtur Adib <arturadib@gmail.com>
Wed, 26 Oct 2011 19:10:58 +0000 (15:10 -0400)
committerArtur Adib <arturadib@gmail.com>
Wed, 26 Oct 2011 19:10:58 +0000 (15:10 -0400)
commit41caf5018d455969f437b1dbcb86ef34b371234f
treed9d58930d2d5965816d9d2d99e120d8a14845f15
parent1d4e3025b6cd375410775ea10a2ac8840dcbdae6
parent8341579fd37f7120d7058f4841e6bc146566b0f9
Merge branch 'refs/heads/master' into filesplit

Conflicts:
pdf.js
src/evaluator.js
src/fonts.js
src/function.js
src/obj.js
src/parser.js