From: Mikael Magnusson <mikachu@gmail.com>
Date: Mon, 27 Oct 2008 00:00:32 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.8-rc2~15
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=9dc5ceeeab3f8fa4c479f39aa736e41f44ff2b60;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4
---

9dc5ceeeab3f8fa4c479f39aa736e41f44ff2b60
diff --cc openbox/event.h
index 1dec416c,a4bd8865..231ccb46
--- a/openbox/event.h
+++ b/openbox/event.h
@@@ -65,8 -65,8 +65,8 @@@ 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();
 +Time event_get_server_time(void);
  
  #endif
diff --cc po/en@boldquot.po
index 973e167c,6ab8eb37..95cc675c
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@@ -30,10 -30,10 +30,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: openbox 3.999.0\n"
 +"Project-Id-Version: openbox 3.4.7-pre1\n"
  "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
- "POT-Creation-Date: 2008-03-03 02:10+0100\n"
- "PO-Revision-Date: 2008-03-03 02:10+0100\n"
+ "POT-Creation-Date: 2008-05-24 16:33+0200\n"
+ "PO-Revision-Date: 2008-05-24 16:33+0200\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"
diff --cc po/en@quot.po
index 2c6fab81,41f9861b..acb8719c
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@@ -27,10 -27,10 +27,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: openbox 3.999.0\n"
 +"Project-Id-Version: openbox 3.4.7-pre1\n"
  "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
- "POT-Creation-Date: 2008-03-03 02:10+0100\n"
- "PO-Revision-Date: 2008-03-03 02:10+0100\n"
+ "POT-Creation-Date: 2008-05-24 16:33+0200\n"
+ "PO-Revision-Date: 2008-05-24 16:33+0200\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"