Google Git
Sign in
android / platform / external / libpng.git / 2694c6a594fc3165121480b474dee919749e406b
commit2694c6a594fc3165121480b474dee919749e406b[log] [tgz]
authorElliott Hughes <enh@google.com>Thu Jun 16 20:47:25 2016 -0700
committerElliott Hughes <enh@google.com>Thu Jun 16 20:47:25 2016 -0700
tree187dc5ae554eb2afa79d1b59643473ae5dc221cf
parent6f25ce204f57a9eec9c514e5fa19ccdf8489cafd [diff]
parent55caa152389df351ba0737f5b5d1163c5c37463b [diff]
resolve merge conflicts of 55caa15 to stage-aosp-master

Change-Id: I5fdab7ea6b35331c5bd6c1e56e226d78d4a5b52a
tree: 187dc5ae554eb2afa79d1b59643473ae5dc221cf
  1. arm/
  2. contrib/
  3. projects/
  4. scripts/
  5. tests/
  6. Android.mk
  7. ANNOUNCE
  8. autogen.sh
  9. CHANGES
  10. CleanSpec.mk
  11. CMakeLists.txt
  12. configure.ac
  13. example.c
  14. INSTALL
  15. libpng-config.in
  16. libpng-manual.txt
  17. libpng.3
  18. libpng.pc.in
  19. libpngpf.3
  20. LICENSE
  21. Makefile.am
  22. MODULE_LICENSE_BSD_LIKE
  23. png.5
  24. png.c
  25. png.h
  26. pngbar.jpg
  27. pngbar.png
  28. pngconf.h
  29. pngdebug.h
  30. pngerror.c
  31. pngget.c
  32. pnginfo.h
  33. pnglibconf.h
  34. pngmem.c
  35. pngnow.png
  36. pngpread.c
  37. pngpriv.h
  38. pngread.c
  39. pngrio.c
  40. pngrtran.c
  41. pngrutil.c
  42. pngset.c
  43. pngstruct.h
  44. pngtest.c
  45. pngtest.png
  46. pngtrans.c
  47. pngusr.dfa
  48. pngusr.h
  49. pngwio.c
  50. pngwrite.c
  51. pngwtran.c
  52. pngwutil.c
  53. README
  54. README.android
  55. README.version
  56. TODO