Merge branch 'master' of ssh://repo.or.cz/srv/git/calf
commitc67ecf01395f78a2a754f891729c815f1a7f760a
authorKrzysztof Foltman <wdev@foltman.com>
Sat, 10 Jan 2015 10:25:38 +0000 (10 10:25 +0000)
committerKrzysztof Foltman <wdev@foltman.com>
Sat, 10 Jan 2015 10:25:38 +0000 (10 10:25 +0000)
treee6efa22c18489a555f260199df0b5b49d3a79f51
parentcf51b5bda6b66d1e79f8c205811ad62b2c9ba3f9
parent2021ae03fdddc6f8717d01b617d6ab38d49e2f0f
Merge branch 'master' of ssh://repo.or.cz/srv/git/calf
src/gui_controls.cpp
src/modules_comp.cpp