From: Justin Seyster <jseyster@cs.sunysb.edu>
Date: Fri, 8 Apr 2011 00:18:16 +0000 (-0400)
Subject: Merge branch 'tc-declare' into tracecut
X-Git-Tag: release-v1.1~9^2~6
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=16129c7f7177f0a6cb3470545c5005e2b5fbc85d;p=interaspect.git

Merge branch 'tc-declare' into tracecut

Conflicts:
	src/tracecut.c
---

16129c7f7177f0a6cb3470545c5005e2b5fbc85d