[xtide/f16: 19/19] resolve merge conflict

[Mamoru Tasaka]

commit b5d610d2928e7872f737c098a23b93aa006db9f3
Merge: d6ac49c 3666664
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Dec 31 16:12:01 2012 +0900

    resolve merge conflict

 .gitignore |    2 ++
 sources    |    4 +---
 xtide.spec |    5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)
---