Skip to content
Verified Commit 933ebf32 authored by Joerg Jaspert's avatar Joerg Jaspert
Browse files

Merge branch 'master' into deploy 

* master:
  Only declare LOCK_STOP once
  Don't modify readonly variables
parents ffc8b98d ded7de58
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment