commit 25093a17b2c426590d1b72113290fe0bbb83b44e Merge: 0ce5d8c db3f53e Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Mon Apr 28 17:23:13 2014 +1000 Merge branch 'el5' Conflicts: libsvm.spec .gitignore | 3 --- libsvm.spec | 56 ++++++++++++++++++++++++++++++-------------------------- 2 files changed, 30 insertions(+), 29 deletions(-) ---