changeset 23:c11c48758df3

Merge
author Some Random Person <seanhalle@yahoo.com>
date Tue, 15 May 2012 06:15:34 -0700
parents fac65c465f98 561d3a06ffc5
children b924d86f829e
files .hgignore CircuitNetlistCreator.c HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h main.c
diffstat 2 files changed, 1 insertions(+), 10 deletions(-) [+]
line diff
     1.1 --- a/.hgignore	Tue May 15 06:00:36 2012 -0700
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,9 +0,0 @@
     1.4 -syntax: glob
     1.5 -
     1.6 -nbproject
     1.7 -build
     1.8 -dist
     1.9 -*.o
    1.10 -.dep.inc
    1.11 -Makefile
    1.12 -notes
     2.1 --- a/CircuitNetlistCreator.c	Tue May 15 06:00:36 2012 -0700
     2.2 +++ b/CircuitNetlistCreator.c	Tue May 15 06:15:34 2012 -0700
     2.3 @@ -7,7 +7,7 @@
     2.4   */
     2.5  #include "HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h"
     2.6   
     2.7 -/*'' is an expr resolves to an actual commPath struct instance
     2.8 +/* is an expr resolves to an actual commPath struct instance
     2.9   */
    2.10  #define setCommPathValuesTo( commPath, fromElIdx, outPort, toElIdx, inPort,\
    2.11                               timeFnPtr, dataPtr)\