diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2008-10-27 00:58:56 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2008-10-27 00:58:56 +0100 |
| commit | e6fea245756b59f83dc0f51d13feee9cf093a1a1 (patch) | |
| tree | cefbc79a17772ac53d3df991d4c6a1c6a6319aaf /openbox/event.h | |
| parent | 7b57ef12963a298c731d0ef4a67de9c985ac9ba4 (diff) | |
| parent | c564b6245fcfaf0efd523cfa17bc1a73fe640d68 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/prop.c
openbox/prop.h
Diffstat (limited to 'openbox/event.h')
| -rw-r--r-- | openbox/event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbox/event.h b/openbox/event.h index ba5a03ea..fb8bb075 100644 --- a/openbox/event.h +++ b/openbox/event.h @@ -60,7 +60,7 @@ void event_halt_focus_delay(void); /*! Compare t1 and t2, taking into account wraparound. True if t1 comes at the same time or later than t2. */ -gboolean event_time_after(Time t1, Time t2); +gboolean event_time_after(guint32 t1, guint32 t2); Time event_get_server_time(void); |