]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into update-md5-2
authorYury Delendik <ydelendik@mozilla.com>
Tue, 17 Apr 2012 21:54:09 +0000 (16:54 -0500)
committerYury Delendik <ydelendik@mozilla.com>
Tue, 17 Apr 2012 21:54:09 +0000 (16:54 -0500)
commitb3c7766bb9ab25e681f0eeab7132449e50232637
tree4aa53f6df5ef2b58deb4cf00868041c534cb5534
parentc21a95c430c969bb8d31abee76bfed0ab7e740de
parentb02b7be8791aa86d7d2ab72bbcfc09168f564975
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into update-md5-2

Conflicts:
test/test_manifest.json
test/test_manifest.json