[plowshare/f13/master: 3/3] Update to svn revision 1414 by request of Elder Marco by mail.

[Pavel Alexeev]

commit ef81eaf1326f8a2dde4e2551ee885ef016c1ef47
Merge: c8c8b86 62a384f
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Sun Apr 24 17:18:00 2011 +0400

    Update to svn revision 1414 by request of Elder Marco by mail.

 .gitignore     |    2 +-
 plowshare.spec |    7 +++++--
 sources        |    4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 4c037db,7b9012e..b3fb94d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/plowshare-SVN-r1391-snapshot.tar.gz
+ /plowshare-SVN-r1414-snapshot.tar.gz
diff --cc sources
index c8eca9f,91742ff..6b63da9
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +b7355f49a7854ebc205f4e732a1d8750  plowshare-SVN-r1391-snapshot.tar.gz
++=======
+ 619ab1319595d0d2638975cfe389ca34  plowshare-SVN-r1414-snapshot.tar.gz
++>>>>>>> origin/master