Homec4science

Merge branch 'maint-1.0' into maint-1.1

Authored by Tibor Simko <tibor.simko@cern.ch> on Dec 16 2013, 20:44.

Description

Merge branch 'maint-1.0' into maint-1.1

  • maint-1.0: intbitset: no crash when intbitset is on rhs

Conflicts:
modules/miscutil/lib/intbitset.c
modules/miscutil/lib/intbitset.pyx

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:db43046de83f: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Dec 16 2013, 20:44

Merged Changes

CommitAuthorDetailsCommitted
ab687a1351d5Samuele Kaplun/Tibor Simko
intbitset: no crash when intbitset is on rhs 
Dec 16 2013