Merge master.

[dcpomatic.git] / src / lib / cross.h

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 00457c9681800a6950596b6cf7044418018eb587..d185286b1f381d02395ba36261313eaac3c10432 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -22,3 +22,4 @@
 #endif
 
 void dcpomatic_sleep (int);
+extern std::pair<std::string, int> cpu_info ();