]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commitdiff
tdcv1.5 is merged - cu
authorCahit <c.ugur@gsi.de>
Fri, 3 May 2013 13:27:10 +0000 (15:27 +0200)
committerCahit <c.ugur@gsi.de>
Fri, 3 May 2013 13:27:10 +0000 (15:27 +0200)
1  2 
base/trb3_components.vhd
wasa/compile_constraints.pl

Simple merge
index 914b02a224d4125c78fcf51df4da9a8f3a091cd5,5f06cb912fcd98fcac44d6d28d6f5a1166fab664..d3b4f2bdcc9df88fb3daa09f270b3fb4bf483046
@@@ -8,5 -7,5 +7,6 @@@ my $TOPNAME  = "trb3_periph_padiwa"; #N
  
  #create full lpf file
  system("cp ../base/$TOPNAME.lpf diamond/$TOPNAME.lpf");
- system("cat ../tdc_releases/tdc_v1.4/trbnet_constraints.lpf >> diamond/$TOPNAME.lpf");
- system("cat ../tdc_releases/tdc_v1.4/tdc_constraints.lpf >> diamond/$TOPNAME.lpf");
+ system("cat ../tdc_releases/tdc_v1.5/trbnet_constraints.lpf >> diamond/$TOPNAME.lpf");
+ system("cat ../tdc_releases/tdc_v1.5/tdc_constraints.lpf >> diamond/$TOPNAME.lpf");
++