Richard Grenville 62ea373ee5 Merge branch 'master' into richardgv-dev ... Conflicts: bin/compton-trans man/compton-trans.1 - Add some explaination in README.md. - Rename CMakeLists.txt to _CMakeLists.txt to avoid confusion.		2012-11-14 18:46:26 +08:00
..
compton-trans	Merge branch 'master' into richardgv-dev	2012-11-14 18:46:26 +08:00