fixed warnings and removed superfluous function call
fixed merge conflict
Merge branch 'shanchen' of github.com:/Marcello-Sega/espresso into Shan-shen
Merge branch 'shanchen' of github.com:/Marcello-Sega/espresso into Shan-shen
fixed small shan-chen bug and cleaned dependency system for cuda files
fixed warning mit Hilfe Georgs
Merge remote-tracking branch 'upstream/master' into shanchen
Merge branch 'Shan-shen' into shanchen
made changes to test case lb_gpu.tcl but still fails for Shan-chen
Georg's attempt to fix Jenkins' problem
removed temperature test for shanchen
minor fixes, need to commit pre-merge
fixed merge conflicts
attempt to fix jenkins' compile ifdef trouble
Merge pull request #99 from ohickey/shanchen

Shanchen