commit 1622e28f6b744500ba1690e890d3b6c04966a52c
Merge: 883e455 5554eba
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 16 17:59:24 2011 +0100
Merge branch 'master' into f15
Go back to linear history.
Conflicts:
maven-ant-tasks.spec
maven-ant-tasks.spec | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
---
Show replies by date