From 6d9de7573202d4b2332667f2d685a0e73e7c0f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Fri, 27 Jun 2014 15:52:45 +0200
Subject: rename time => timestamp to avoid naming conflicts

---
 include/llmr/style/style.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/llmr/style')

diff --git a/include/llmr/style/style.hpp b/include/llmr/style/style.hpp
index 71e1997e7f..73ad6d6bd2 100644
--- a/include/llmr/style/style.hpp
+++ b/include/llmr/style/style.hpp
@@ -61,7 +61,7 @@ public:
     void cascade(float z);
 
     bool needsTransition() const;
-    void updateTransitions(time now);
+    void updateTransitions(timestamp now);
     void cancelTransitions();
 
     void setDefaultTransitionDuration(uint64_t duration_milliseconds = 0);
-- 
cgit v1.2.1