Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / external / libjpeg-turbo / b1398cba43cab0acbb02dcde57c27b3c3f3dc3e3
commitb1398cba43cab0acbb02dcde57c27b3c3f3dc3e3[log] [tgz]
authorDRC <dcommander@users.sourceforge.net>Sun Apr 20 07:35:16 2014 +0000
committerDRC <dcommander@users.sourceforge.net>Sun Apr 20 07:35:16 2014 +0000
treeace197e276a6e063c39001c81b4df174accb1be8
parent50cfc464b8fdee7f7388ef14284c632b553c2f4a [diff]
Prevent svn:mergeinfo from being modified on Makefile.am and simd/jsimd*.c every time a merge is done.


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@1254 632fc199-4ca6-4c93-a231-07263d6284db
tree: ace197e276a6e063c39001c81b4df174accb1be8
  1. cmakescripts/
  2. doc/
  3. java/
  4. release/
  5. sharedlib/
  6. simd/
  7. testimages/
  8. win/
  9. acinclude.m4
  10. bmp.c
  11. bmp.h
  12. BUILDING.txt
  13. cderror.h
  14. cdjpeg.c
  15. cdjpeg.h
  16. change.log
  17. ChangeLog.txt
  18. cjpeg.1
  19. cjpeg.c
  20. CMakeLists.txt
  21. coderules.txt
  22. configure.ac
  23. djpeg.1
  24. djpeg.c
  25. doxygen.config
  26. example.c
  27. filelist.txt
  28. install.txt
  29. jaricom.c
  30. jcapimin.c
  31. jcapistd.c
  32. jcarith.c
  33. jccoefct.c
  34. jccolext.c
  35. jccolor.c
  36. jcdctmgr.c
  37. jchuff.c
  38. jchuff.h
  39. jcinit.c
  40. jcmainct.c
  41. jcmarker.c
  42. jcmaster.c
  43. jcomapi.c
  44. jconfig.h.in
  45. jconfig.txt
  46. jcparam.c
  47. jcphuff.c
  48. jcprepct.c
  49. jcsample.c
  50. jcstest.c
  51. jctrans.c
  52. jdapimin.c
  53. jdapistd.c
  54. jdarith.c
  55. jdatadst-tj.c
  56. jdatadst.c
  57. jdatasrc-tj.c
  58. jdatasrc.c
  59. jdcoefct.c
  60. jdcolext.c
  61. jdcolor.c
  62. jdct.h
  63. jddctmgr.c
  64. jdhuff.c
  65. jdhuff.h
  66. jdinput.c
  67. jdmainct.c
  68. jdmarker.c
  69. jdmaster.c
  70. jdmerge.c
  71. jdmrgext.c
  72. jdphuff.c
  73. jdpostct.c
  74. jdsample.c
  75. jdtrans.c
  76. jerror.c
  77. jerror.h
  78. jfdctflt.c
  79. jfdctfst.c
  80. jfdctint.c
  81. jidctflt.c
  82. jidctfst.c
  83. jidctint.c
  84. jidctred.c
  85. jinclude.h
  86. jmemmgr.c
  87. jmemnobs.c
  88. jmemsys.h
  89. jmorecfg.h
  90. jpegcomp.h
  91. jpegint.h
  92. jpeglib.h
  93. jpegtran.1
  94. jpegtran.c
  95. jquant1.c
  96. jquant2.c
  97. jsimd.h
  98. jsimd_none.c
  99. jsimddct.h
  100. jutils.c
  101. jversion.h
  102. libjpeg.map.in
  103. libjpeg.txt
  104. Makefile.am
  105. rdbmp.c
  106. rdcolmap.c
  107. rdgif.c
  108. rdjpgcom.1
  109. rdjpgcom.c
  110. rdppm.c
  111. rdrle.c
  112. rdswitch.c
  113. rdtarga.c
  114. README
  115. README-turbo.txt
  116. structure.txt
  117. tjbench.c
  118. tjbenchtest.in
  119. tjexampletest.in
  120. tjunittest.c
  121. tjutil.c
  122. tjutil.h
  123. transupp.c
  124. transupp.h
  125. turbojpeg-jni.c
  126. turbojpeg-mapfile
  127. turbojpeg-mapfile.jni
  128. turbojpeg.c
  129. turbojpeg.h
  130. usage.txt
  131. wizard.txt
  132. wrbmp.c
  133. wrgif.c
  134. wrjpgcom.1
  135. wrjpgcom.c
  136. wrppm.c
  137. wrrle.c
  138. wrtarga.c