]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae611e5 f74772f)
Merge branch 'master' into issue-1090
authorJames Campos <james.r.campos@gmail.com>
Sun, 22 Jan 2012 06:56:33 +0000 (22:56 -0800)
committerJames Campos <james.r.campos@gmail.com>
Sun, 22 Jan 2012 06:56:33 +0000 (22:56 -0800)
1  2 
Makefile patch | diff1 | diff2 | blob | history

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