Mercurial > projects > qtd

changeset 168:d66bbb9a5053

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ups
author eldar
date Sat, 20 Jun 2009 19:17:21 +0000
parents ae06da58ec25
children 473164283a60
files qt/QGlobal.d
diffstat 1 files changed, 0 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/qt/QGlobal.d	Sat Jun 20 19:14:29 2009 +0000
+++ b/qt/QGlobal.d	Sat Jun 20 19:17:21 2009 +0000
@@ -401,15 +401,9 @@
 
 void qSwap(T)(ref T value1, ref T value2)
 {
-<<<<<<< .mine
-    const T.nativeId t = value1.nativeId;
-    value1.nativeId = value2.nativeId;
-    value2.nativeId = t;
-=======
     T t = value1;
     value1 = value2;
     value2 = t;
->>>>>>> .r170
 }
 
 /*