From 175a1709826b997c7ee4145f0e10b454c00a80c4 Mon Sep 17 00:00:00 2001
From: Antony Polukhin <antoshkka@gmail.com>
Date: Sun, 24 Feb 2013 08:31:17 +0000
Subject: Merge from trunk: * Silence some buggy VS warnings (fixes #7949) *
 Fix -Wconversion warnings (fixes #2558) * Added support for int128
 conversions (fixes #7909)

[SVN r83114]
---
 libs/conversion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libs/conversion')

diff --git a/libs/conversion b/libs/conversion
index 518203671c..335c868e9b 160000
--- a/libs/conversion
+++ b/libs/conversion
@@ -1 +1 @@
-Subproject commit 518203671cfcc8fccb56a504011984c26870da2f
+Subproject commit 335c868e9b276cde41b4a94b61699294d01e2194
-- 
cgit v1.2.1