Merge branch 'develop' into feature/cubiquity-version

2013-11-14 15:36:25 +01:00
parent f2ecb667e8 3db5e1b2f6
commit 15b170696c
2 changed files with 12 additions and 0 deletions
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h
@@ -43,6 +43,7 @@ namespace PolyVox
 		
 		float elapsedTimeInSeconds(void);
 		uint32_t elapsedTimeInMilliSeconds(void);
+		uint32_t elapsedTimeInMicroSeconds(void);
 		
 	private:
 #if defined(_MSC_VER)