]> git.parisson.com Git - pdf.js.git/commit
Merge remote-tracking branch 'mozilla/master' into issue1133
authorArtur Adib <arturadib@gmail.com>
Tue, 7 Feb 2012 00:11:52 +0000 (16:11 -0800)
committerArtur Adib <arturadib@gmail.com>
Tue, 7 Feb 2012 00:11:52 +0000 (16:11 -0800)
commitc49e9ec07aaedacda9ab68dfc8ecb3eb64afb7d3
tree617a5614c1299fba34fccc1fa206815680abc894
parent00b7e7d2552e66a71451f2fc4d06b644f76263c1
parent51d831ed032890039efa138e1154eafdb288a241
Merge remote-tracking branch 'mozilla/master' into issue1133

Conflicts:
src/util.js
test/test_manifest.json
src/util.js
test/test_manifest.json