~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to libust/tracectl.c

  • Committer: Pierre-Marc Fournier
  • Date: 2009-10-27 22:58:15 UTC
  • mfrom: (232.1.5)
  • Revision ID: git-v1:aa08b4413291fabcbd1b1144377d37034ad361de
Merge branch 'for-pierre-marc' of git://git.infradead.org/users/jblunck/ust

Fixed conflicts:
        include/ust/marker.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
29
29
 
30
30
#include <urcu-bp.h>
31
31
 
32
 
#include "marker.h"
 
32
#include <ust/marker.h>
33
33
#include "tracer.h"
34
 
#include "localerr.h"
 
34
#include "usterr.h"
35
35
#include "ustcomm.h"
36
36
#include "relay.h" /* FIXME: remove */
37
37
#include "marker-control.h"