git.parisson.com Git - pdf.js.git/commit

]> git.parisson.com Git - pdf.js.git/commit

projects / pdf.js.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 493fb45 d7ff95f)

author	sbarman <sbarman@L3CWZ5T.(none)>
	Wed, 6 Jul 2011 17:36:49 +0000 (10:36 -0700)
committer	sbarman <sbarman@L3CWZ5T.(none)>
	Wed, 6 Jul 2011 17:36:49 +0000 (10:36 -0700)
commit	9d182ec9ef9d686df436d3bb07ca0d034fdf36de
tree	b00692e4c285842fcd3f45c570b1e0f008acf31f	tree \| snapshot
parent	493fb45efd09bf06fd73f87a612e9fa8287a515e	commit \| diff
parent	d7ff95f0de4828f0ac549d868ffa43e740f8f72a	commit \| diff

Merge branch 'master' into patterncs

Conflicts:
pdf.js

Unnamed repository; edit this file 'description' to name the repository.