commit ac8d181e671341bac22c74fde8f9d8d7e491cb0e Merge: 10143c8 db80b84 Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Tue Aug 26 15:18:20 2014 +1000 Merge branch 'master' into el5 .gitignore | 4 ++-- cmake-fedora.spec | 16 +++++++++++++++- sources | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) ---