x11perf: Changes to 'master'

[Alan Coopersmith]

 bitmaps.c |   19 ++++++++++---------
 x11perf.c |   60 ++++++++++++++++++++++++++++--------------------------------
 2 files changed, 38 insertions(+), 41 deletions(-)

New commits:
commit 2b5c1ff8926b82675c8db1f44de4c910dd9265a4
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Oct 25 14:10:02 2014 -0700

    Combine help_message array into a single string
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 2179b566688838439d6388e1468af404e06d7350
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Oct 25 13:57:43 2014 -0700

    Mark bitmap data as const
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>