From 97ba4bac6d1f19eecff12d48dc2a11110ff54a3d Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Fri, 21 Mar 2014 09:33:49 +0000
Subject: [PATCH] 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/trunk@1190 632fc199-4ca6-4c93-a231-07263d6284db