Merge branch 'master' into compile_with_qt5
commit228fe4897029be5946aadd4afcf69f319e9cb462
authorCristian Tibirna <cristian@tibirna.org>
Sun, 28 Feb 2016 20:07:38 +0000 (28 15:07 -0500)
committerCristian Tibirna <cristian@tibirna.org>
Sun, 28 Feb 2016 20:07:38 +0000 (28 15:07 -0500)
treec6de3e17e98716fe9dbc40a2b3b1c49ca801a9e2
parentc220af9146c33c6698e97586cf05296b0037fb4c
parenta581f22a6b1fc3fb024001e5f4ef0988572919b5
Merge branch 'master' into compile_with_qt5
src/common.cpp