← Back to branch summary

~oif-team/grail/trunk

~oif-team/grail/trunk

« back to all changes in this revision

Viewing changes to tools/common/servertime.h

Committer: Chase Douglas
Date: 2012-07-25 23:09:08 UTC
mfrom: (229.2.4 grail)
Revision ID: chase.douglas@canonical.com-20120725230908-1l25qh2ex2ueanqj

Merge in project rename

files renamed:
utouch-grail.pc.in => grail.pc.in

include/utouch/ => include/oif/

src/libutouch-grail.ver => src/libgrail.ver

files modified:
.bzrignore

INSTALL

Makefile.am

configure.ac

include/oif/grail.h

m4/xorg-gtest.m4

src/Makefile.am

src/atomic-recognizer.cpp

src/atomic-recognizer.h

src/event.cpp

src/event.h

src/forward.h

src/gesture.cpp

src/gesture.h

src/handle.cpp

src/handle.h

src/log.cpp

src/log.h

src/recognizer.cpp

src/recognizer.h

src/regular-recognizer.cpp

src/regular-recognizer.h

src/slice.cpp

src/slice.h

src/subscription.cpp

src/subscription.h

src/touch.cpp

src/touch.h

test/integration/Makefile.am

test/integration/device.cpp

test/integration/device.h

test/integration/events.h

test/integration/recording.cpp

test/integration/recording.h

test/integration/slice-checker.cpp

test/integration/slice-checker.h

test/integration/x11/atomic-timeout.cpp

test/integration/x11/dragthresh.cpp

test/integration/x11/fixture.cpp

test/integration/x11/fixture.h

test/integration/x11/hold-reject.cpp

test/integration/x11/no-premature-gestures.cpp

test/integration/x11/no-tap-after-drag.cpp

test/integration/x11/parallel-atomic-gestures.cpp

test/integration/x11/tap-touch-accept.cpp

test/integration/x11/timeout.cpp

test/integration/x11/twodrag.cpp

test/regular/Makefile.am

test/regular/frame_mock.h

test/regular/grail-fixture.h

test/regular/grail.cpp

test/regular/intermittent_3touch.cpp

test/regular/one-touch-gest-finished.cpp

test/regular/pending-end.cpp

test/regular/subscription.cpp

test/regular/test-c-compile.c

test/regular/test-cxx-compile.cpp

tools/Makefile.am

tools/common/device.c

tools/common/device.h

tools/common/servertime.c

tools/common/servertime.h

tools/common/slice.c

tools/common/slice.h

tools/grail-test-3-1.1

tools/grail-test-3-1.c

tools/grail-test-atomic.1

tools/grail-test-atomic.c

tools/grail-test-edge.1

tools/grail-test-edge.c

tools/grail-test-propagation.1

tools/grail-test-propagation.c

Show diffs side-by-side

added added

removed removed

tools/common/servertime.h

1

1

/*****************************************************************************

2

2

*

3

* utouch-frame - Touch Frame Library

3

* frame - Touch Frame Library

4

4

*

5

5

* Copyright (C) 2010-2011 Canonical Ltd.

6

6

*

24

24

#include <X11/Xlib.h>

25

25

#include <X11/extensions/sync.h>

26

26

27

#include <utouch/grail.h>

27

#include <oif/grail.h>

28

28

29

29

XSyncAlarm create_alarm(Display *display);

30

30

void destroy_alarm(Display *display, XSyncAlarm alarm);

Older »