# HG changeset patch
# User Some Random Person <seanhalle@yahoo.com>
# Date 1337087734 25200
# Node ID c11c48758df3617819e8149997840cb686b9a8a3
# Parent  fac65c465f987ddda509c81ea3d2c188b5f9feac# Parent  561d3a06ffc5ce3f228747d238a07ea6d2054249
Merge

diff -r fac65c465f98 -r c11c48758df3 .hgignore
--- a/.hgignore	Tue May 15 06:00:36 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-syntax: glob
-
-nbproject
-build
-dist
-*.o
-.dep.inc
-Makefile
-notes
diff -r fac65c465f98 -r c11c48758df3 CircuitNetlistCreator.c
--- a/CircuitNetlistCreator.c	Tue May 15 06:00:36 2012 -0700
+++ b/CircuitNetlistCreator.c	Tue May 15 06:15:34 2012 -0700
@@ -7,7 +7,7 @@
  */
 #include "HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h"
  
-/*'' is an expr resolves to an actual commPath struct instance
+/* is an expr resolves to an actual commPath struct instance
  */
 #define setCommPathValuesTo( commPath, fromElIdx, outPort, toElIdx, inPort,\
                              timeFnPtr, dataPtr)\