]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45d6daa 60dd0e0)
Merge branch 'fixpassword', remote-tracking branch 'origin/master' into fixpassword
authorJakob Miland <saebekassebil@gmail.com>
Wed, 16 May 2012 19:03:09 +0000 (21:03 +0200)
committerJakob Miland <saebekassebil@gmail.com>
Wed, 16 May 2012 19:03:09 +0000 (21:03 +0200)
1  2 
web/viewer.js patch | diff1 | diff2 | blob | history

diff --cc web/viewer.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.