Merge branch 'master' of trandk1@rtime.felk.cvut.cz:/var/git/eurobot

diff --cc src/robofsm/test/Makefile.omk
index 8be45497b9ca00503bec11c47883f7c94b0f968b,c54b16b0869d4a12e5f0ddd1363540890065e339..783fd43f50043dc253770d1e0c7d8675a5778540
--- 1/src/robofsm/test/Makefile.omk
--- 2/src/robofsm/test/Makefile.omk
+++ b/src/robofsm/test/Makefile.omk
@@@ -12,12 -12,9 +12,12 @@@ odometry_SOURCES = odometry.c
  test_PROGRAMS += goto
  goto_SOURCES = goto.cc
  
- #test_PROGRAMS += display
- #display_SOURCES = display.cc
+ test_PROGRAMS += display
+ display_SOURCES = display.cc
  
 +test_PROGRAMS += mcl-laser
 +mcl-laser_SOURCES = mcl-laser.cc
 +
  # Libraries linked to all programs in this Makefile
  lib_LOADLIBES = robot_eb2008 mcl laser-nav robomath uoled oledlib sercom roboorte_generic roboorte_eb2008 \
                robottype robottype_eb2008 pthread \