Gitiles
Code Review Sign In
review.blissroms.org / platform_external_libjpeg-turbo / fc9995e4c91ca48ae66048e269f8adf154ddcec7
commitfc9995e4c91ca48ae66048e269f8adf154ddcec7[log] [tgz]
authorDRC <dcommander@users.sourceforge.net>Fri Mar 21 09:35:53 2014 +0000
committerDRC <dcommander@users.sourceforge.net>Fri Mar 21 09:35:53 2014 +0000
tree5727461ea90baf386d7b8b10ef5d389d3e793e5c
parent506a742193ed5549074f40c3e0d2f0fd2eefb22b [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.3.x@1192 632fc199-4ca6-4c93-a231-07263d6284db
tree: 5727461ea90baf386d7b8b10ef5d389d3e793e5c
  1. cmakescripts/
  2. doc/
  3. java/
  4. md5/
  5. release/
  6. sharedlib/
  7. simd/
  8. testimages/
  9. win/
  10. acinclude.m4
  11. bmp.c
  12. bmp.h
  13. BUILDING.txt
  14. cderror.h
  15. cdjpeg.c
  16. cdjpeg.h
  17. change.log
  18. ChangeLog.txt
  19. cjpeg.1
  20. cjpeg.c
  21. CMakeLists.txt
  22. coderules.txt
  23. configure.ac
  24. djpeg.1
  25. djpeg.c
  26. doxygen.config
  27. example.c
  28. jaricom.c
  29. jcapimin.c
  30. jcapistd.c
  31. jcarith.c
  32. jccoefct.c
  33. jccolext.c
  34. jccolor.c
  35. jcdctmgr.c
  36. jchuff.c
  37. jchuff.h
  38. jcinit.c
  39. jcmainct.c
  40. jcmarker.c
  41. jcmaster.c
  42. jcomapi.c
  43. jconfig.h.in
  44. jconfig.txt
  45. jcparam.c
  46. jcphuff.c
  47. jcprepct.c
  48. jcsample.c
  49. jcstest.c
  50. jctrans.c
  51. jdapimin.c
  52. jdapistd.c
  53. jdarith.c
  54. jdatadst-tj.c
  55. jdatadst.c
  56. jdatasrc-tj.c
  57. jdatasrc.c
  58. jdcoefct.c
  59. jdcolext.c
  60. jdcolor.c
  61. jdct.h
  62. jddctmgr.c
  63. jdhuff.c
  64. jdhuff.h
  65. jdinput.c
  66. jdmainct.c
  67. jdmarker.c
  68. jdmaster.c
  69. jdmerge.c
  70. jdmrgext.c
  71. jdphuff.c
  72. jdpostct.c
  73. jdsample.c
  74. jdtrans.c
  75. jerror.c
  76. jerror.h
  77. jfdctflt.c
  78. jfdctfst.c
  79. jfdctint.c
  80. jidctflt.c
  81. jidctfst.c
  82. jidctint.c
  83. jidctred.c
  84. jinclude.h
  85. jmemmgr.c
  86. jmemnobs.c
  87. jmemsys.h
  88. jmorecfg.h
  89. jpegcomp.h
  90. jpegint.h
  91. jpeglib.h
  92. jpegtran.1
  93. jpegtran.c
  94. jquant1.c
  95. jquant2.c
  96. jsimd.h
  97. jsimd_none.c
  98. jsimddct.h
  99. jutils.c
  100. jversion.h
  101. libjpeg.map.in
  102. libjpeg.txt
  103. Makefile.am
  104. rdbmp.c
  105. rdcolmap.c
  106. rdgif.c
  107. rdjpgcom.1
  108. rdjpgcom.c
  109. rdppm.c
  110. rdrle.c
  111. rdswitch.c
  112. rdtarga.c
  113. README
  114. README-turbo.txt
  115. structure.txt
  116. tjbench.c
  117. tjbenchtest.in
  118. tjbenchtest.java.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