Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3sc

diff --cc pinout/basic_constraints.lpf
Simple merge

diff --cc scripts/compile.pl
Simple merge

diff --cc tdctemplate/config.vhd
Simple merge

diff --cc tdctemplate/trb3sc_tdctemplate.prj
Simple merge

diff --cc tdctemplate/trb3sc_tdctemplate.vhd
Simple merge

diff --cc template/config_compile_gsi.pl
index 8fb3469a85b603feab24efe2d178eb68621c449b,29d7ee370507e18104138a0ede795d3d35c6ddab..1f1b04bc5c58bec19ae132629b511fc1b1bab0eb
--- 1/template/config_compile_gsi.pl
--- 2/template/config_compile_gsi.pl
+++ b/template/config_compile_gsi.pl
@@@ -3,12 -3,11 +3,11 @@@ lm_license_file_for_synplify => "27000\
  lm_license_file_for_par      => "1702\@hadeb05.gsi.de",
  lattice_path                 => '/opt/lattice/diamond/3.4_x64/',
  synplify_path                => '/opt/synplicity/J-2014.09-SP2',
- #synplify_command             => "/opt/lattice/diamond/3.5_x64/bin/lin64/synpwrap -fg -options",
- synplify_command             => "/opt/synplicity/J-2014.09-SP2/bin/synplify_premier_dp",
+ #synplify_command             => "/opt/lattice/diamond/3.4_x64/bin/lin64/synpwrap -fg -options",
+ synplify_command             => "/opt/synplicity/K-2015.09/bin/synplify_premier_dp",
  
 -nodelist_file                => 'nodelist_gsi_template.txt',
 +nodelist_file                => 'nodes_gsi_template.txt',
  
- include_TDC                  => 1,
- 
  firefox_open                 => 0,
  
+