From: DRC <dcommander@users.sourceforge.net>
Date: Sun, 20 Apr 2014 07:35:16 +0000 (+0000)
Subject: Prevent svn:mergeinfo from being modified on Makefile.am and simd/jsimd*.c every... 
X-Git-Tag: 1.3.90~92^2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1398cba43cab0acbb02dcde57c27b3c3f3dc3e3;p=libjpeg-turbo

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
---