# HG changeset patch
# User Santeri Piippo <crimsondusk64@gmail.com>
# Date 1394634109 -7200
# Node ID 09150d027e8cb0625fdcb99ecbb6fca250dc5bae
# Parent  d19213bec2f98380aa90340dbe85ebf67c7632e9# Parent  a74f2ff353b841aa10f2ff85c6e17284dba95ec7
Merge ../ldforge into gl

diff -r d19213bec2f9 -r 09150d027e8c src/Format.h
--- a/src/Format.h	Tue Mar 11 16:42:37 2014 +0200
+++ b/src/Format.h	Wed Mar 12 16:21:49 2014 +0200
@@ -35,6 +35,7 @@
 		StringFormatArg (const uchar& a) : m_text (a) {}
 		StringFormatArg (const QChar& a) : m_text (a) {}
 		StringFormatArg (int a) : m_text (QString::number (a)) {}
+		StringFormatArg (long a) : m_text (QString::number (a)) {}
 		StringFormatArg (const float& a) : m_text (QString::number (a)) {}
 		StringFormatArg (const double& a) : m_text (QString::number (a)) {}
 		StringFormatArg (const Vertex& a) : m_text (a.toString (false)) {}
@@ -168,4 +169,4 @@
 	(void) fmtstr;
 	(void) args;
 #endif
-}
\ No newline at end of file
+}