Merge branch 'tc-declare' into tracecut
authorJustin Seyster <jseyster@cs.sunysb.edu>
Fri, 8 Apr 2011 00:18:16 +0000 (20:18 -0400)
committerJustin Seyster <jseyster@cs.sunysb.edu>
Fri, 8 Apr 2011 00:18:16 +0000 (20:18 -0400)
Conflicts:
src/tracecut.c

1  2 
src/tracecut.c
src/tracecut.h

diff --cc src/tracecut.c
Simple merge
diff --cc src/tracecut.h
Simple merge