Merge branch 'master' into 3D-NN-walkers-example

examples/Utils/b3Clock.h

@@ -20,6 +20,9 @@ public:
 	/// the b3Clock was created.
 	unsigned long int getTimeMilliseconds();
 
+	/// Gets the system time in milliseconds
+	unsigned long int getSystemTimeMilliseconds();
+
 	/// Returns the time in us since the last call to reset or since 
 	/// the Clock was created.
 	unsigned long long int getTimeMicroseconds();
@@ -28,9 +31,6 @@ public:
 	/// the Clock was created.
 	double getTimeInSeconds();
 
-	/// Gets the system time in milliseconds
-	double getSystemTimeMilliseconds();
-
 	///Sleep for 'microSeconds', to yield to other threads and not waste 100% CPU cycles.
 	///Note that some operating systems may sleep a longer time.
 	static void usleep(int microSeconds);