]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 678b7dc e9cd29c)
Merge remote-tracking branch 'upstream/master' into dev
authorKalervo Kujala <kkujala@com>
Thu, 5 Jan 2012 19:16:15 +0000 (21:16 +0200)
committerKalervo Kujala <kkujala@com>
Thu, 5 Jan 2012 19:16:15 +0000 (21:16 +0200)
Conflicts:
Makefile
test/unit/unit_test.html

1  2 
Makefile patch | diff1 | diff2 | blob | history

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