Armin Rigo committed a158a37 Merge

merge heads

Comments (0)

Files changed (1)


 Remi Meier
 Maciej Fijalkowski
 Romain Guillebert
-Armin Rigo (late)
+Armin Rigo
 Manuel Jacob
+Antonio Cuni
-* numpy stuff, fix bugs from bug tracker (rguillebert, ?)
+* numpy stuff, fix bugs from bug tracker (rguillebert, antocuni around)
 * look at codespeed2
-* resume-refactor branch (rguillebert, fijal) (PROGRESS)
+* resume-refactor branch (fijal, rguillebert) MORE PROGRESS
 * GC pinning
 * CFFI 1.0
-* STM (remi, armin) SOME PROGRESS in transaction breaks
+* STM (remi, armin) DONE in transaction breaks, started c7
 * discuss about C++ / cppyy, look into importing pyshiboken (johan pessimistic, ?)
-* ctypes:
+* try cppyy to run on windows (johan) IN PROGRESS
+* ctypes: DONE
 * longs multiplication: patch at
-* look into merging refactor-str-types (johan, mjacob)
+* look into merging refactor-str-types (mjacob, antocuni) FIX TRANSLATION
-* tweaking ast classes:
+* tweaking ast classes: (mjacob)
+* skiing (fijal, DONE)
+* add jit_merge_point to tuple_contains (anybody)