[vbam/el7: 3/4] Merge branch 'master' into el7
commit dbe6242fcccf6089ba3755d2a4efdc6e41451735
Merge: 8acf381 2284e57
Author: Mystro256 <alexjnewt(a)hotmail.com>
Date: Wed Jan 18 20:12:48 2017 -0500
Merge branch 'master' into el7
.gitignore | 1 -
dead.package | 1 +
sources | 1 -
vbam-1.8.0.1229-includedir.patch | 32 ------
vbam.spec | 215 ---------------------------------------
5 files changed, 1 insertion(+), 249 deletions(-)
---