Google Git
Sign in
skia / third_party / poppler / 07992075a6d1d29db57f997f67d5a4a6deacbbb4
commit07992075a6d1d29db57f997f67d5a4a6deacbbb4[log] [tgz]
authorAlbert Astals Cid <aacid@kde.org>Sun Jun 09 12:17:53 2013 +0200
committerAlbert Astals Cid <aacid@kde.org>Sun Jun 09 12:17:53 2013 +0200
tree9d5d19813e1f2c0d0ab853c2897ca07738fb2542
parent4a0bd6fdb2e9e3c589e1bdb282e7c2bfca8567b1 [diff]
parent25f453ef49004452ac4c201d59d9ce2ef52ffeee [diff]
Merge remote-tracking branch 'origin/poppler-0.22'

Conflicts:
	poppler/Catalog.cc
	qt4/src/poppler-private.h
	utils/HtmlOutputDev.cc
tree: 9d5d19813e1f2c0d0ab853c2897ca07738fb2542
  1. cmake/
  2. cpp/
  3. fofi/
  4. glib/
  5. goo/
  6. m4/
  7. poppler/
  8. qt4/
  9. regtest/
  10. splash/
  11. test/
  12. utils/
  13. .gitignore
  14. AUTHORS
  15. autogen.sh
  16. CMakeLists.txt
  17. config.h.cmake
  18. configure.ac
  19. ConfigureChecks.cmake
  20. COPYING
  21. COPYING3
  22. gtk-doc.make
  23. INSTALL
  24. Makefile.am
  25. NEWS
  26. poppler-cairo-uninstalled.pc.in
  27. poppler-cairo.pc.cmake
  28. poppler-cairo.pc.in
  29. poppler-cpp-uninstalled.pc.in
  30. poppler-cpp.pc.cmake
  31. poppler-cpp.pc.in
  32. poppler-glib-uninstalled.pc.in
  33. poppler-glib.pc.cmake
  34. poppler-glib.pc.in
  35. poppler-qt4-uninstalled.pc.in
  36. poppler-qt4.pc.cmake
  37. poppler-qt4.pc.in
  38. poppler-splash-uninstalled.pc.in
  39. poppler-splash.pc.cmake
  40. poppler-splash.pc.in
  41. poppler-uninstalled.pc.in
  42. poppler.pc.cmake
  43. poppler.pc.in
  44. README
  45. README-XPDF
  46. README.contributors
  47. TODO