Merge branch 'master' of molnam1@rtime.felk.cvut.cz:/var/git/frescor

diff --cc wme_test/plot_commands
index 1799216240b60aaf79341ab04cad9aee3e0dca41,2a9fb8dc14532e40f43f1e4bae2333a72d40d316..4b07c2cd24d11de7a7a2f706ed7b3fe2114161d8
--- 1/wme_test/plot_commands
--- 2/wme_test/plot_commands
+++ b/wme_test/plot_commands
@@@ -1,8 -1,8 +1,8 @@@
  set term postscript color
  set output 'delay_stats.eps'
  #set term x11
 -set title "TITLE"
 +#set title "TITLE"
  set xlabel "Delay (ms)"
- set ylabel "Count"
+ set ylabel "Packet percentage"
  set key right top nobox
  plot [0:*] [0:*] "delay_stats.dat" index 0 smooth csplines title "VO","delay_stats.dat" index 1 smooth csplines title "VI", "delay_stats.dat" index 2 smooth csplines title "BE", "delay_stats.dat" index 3 smooth csplines title "BK"

diff --cc wme_test/wclient.c
Simple merge