]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31f3164 f80a888)
Merge branch 'master' of github.com:andreasgal/pdf.js
authorAndreas Gal <andreas.gal@gmail.com>
Sat, 21 May 2011 00:34:22 +0000 (02:34 +0200)
committerAndreas Gal <andreas.gal@gmail.com>
Sat, 21 May 2011 00:34:22 +0000 (02:34 +0200)
1  2 
test.html patch | diff1 | diff2 | blob | history

diff --cc test.html
Simple merge
Unnamed repository; edit this file 'description' to name the repository.