Commit History

Author SHA1 Message Date
  Thomas Waldmann 045e5a1203 Merge branch 'master' into move-to-src 9 years ago
  Marian Beermann 478a6f29b6 Lower PBKDF2 iteration count for the tests 9 years ago
  Marian Beermann 4f1157c3a4 fix tox build for environment-python != containing-python in yet-another instance 9 years ago
  Thomas Waldmann 24204b181b remove conftest sys.path hack, fixes #1072 9 years ago
  Marian Beermann 43258abf21 Fix tox 9 years ago
  Marian Beermann 805f63167c Translate Linux fsflags to BSD flags and vice versa 9 years ago