Merge remote-tracking branch 'origin/3.0'

2013-12-02 15:33:56 +01:00
parent 7206a46952 242cb17919
commit 0a893fc6b4
28 changed files with 415 additions and 212 deletions
@@ -818,7 +818,7 @@ Hex2EncodedFloat4, \
 Hex2EncodedFloat8, \
 IPv6AddressAndHexScopeId, \
 Hex2EncodedUtf8WithoutQuotes, \
-MillisecondsSinceEpoch \
+DateTimeInternal \
    = range(30)

 # Display modes. Keep that synchronized with DebuggerDisplay in watchutils.h