Merge pull request #1336 from bbudescu/master

.gitignore

@@ -35,3 +35,4 @@ distribute-*.egg
 distribute-*.tar.gz
 Theano.suo
 *.DS_Store
+*.bak
\ No newline at end of file

theano/sandbox/cuda/nvcc_compiler.py

@@ -279,7 +279,7 @@ class NVCC_compiler(object):
 
         if sys.platform == 'win32':
             # add flags for Microsoft compiler to create .pdb files
-            preargs2.append('/Zi')
+            preargs2.extend(['/Zi', '/MD'])
             cmd.extend(['-Xlinker', '/DEBUG'])
 
         if local_bitwidth() == 64:

theano/sandbox/rng_mrg.py

@@ -452,7 +452,7 @@ class GPU_mrg_uniform(mrg_uniform_base, GpuOp):
                 y2 += x23;
                 y2 -= (y2 < 0 || y2 >= M2) ? M2 : 0;
                 y2 += y1;
-                y2 -= (y2 < 0 or y2 >= M2) ? M2 : 0;
+                y2 -= (y2 < 0 || y2 >= M2) ? M2 : 0;
 
                 x23 = x22;
                 x22 = x21;
@@ -595,7 +595,7 @@ class GPU_mrg_uniform(mrg_uniform_base, GpuOp):
         //////// </ code generated by mrg_uniform>
         """ %locals()
     def c_code_cache_version(self):
-        return (6,)
+        return (7,)
 
 
 def guess_n_streams(size, warn=True):