[php-pdepend-PHP-Depend: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-pdepend-PHP-Depend

[Christof Damian]

commit d21b2ee822977bf5f20cd9c8e348316767c851e9
Merge: 6d7d6fe ba1263e
Author: Christof Damian <christof at damian.net>
Date:   Sun Oct 30 17:56:50 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-pdepend-PHP-Depend
    
    Conflicts:
    	.gitignore
    	php-pdepend-PHP-Depend.spec
    	sources

 .gitignore                  |    6 ------
 php-pdepend-PHP-Depend.spec |    6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index dbd3fd2,90c9877..ee73533
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,8 +1,1 @@@
--PHP_Depend-0.9.16.tgz
--PHP_Depend-0.9.17.tgz
--/PHP_Depend-0.9.18.tgz
--/PHP_Depend-0.9.19.tgz
--/PHP_Depend-0.10.1.tgz
--/PHP_Depend-0.10.2.tgz
 -/PHP_Depend-0.10.3.tgz
 -/PHP_Depend-0.10.5.tgz
 +/PHP_Depend-0.10.6.tgz
diff --cc php-pdepend-PHP-Depend.spec
index 9797230,93431d7..c990b74
--- a/php-pdepend-PHP-Depend.spec
+++ b/php-pdepend-PHP-Depend.spec
@@@ -78,9 -78,12 +78,15 @@@ f
  %{_bindir}/pdepend
  
  %changelog
 +* Sun Oct 30 2011 Christof Damian <christof at damian.net> - 0.10.6-1
 +- upstream 0.10.6
 +
+ * Fri May 20 2011 Christof Damian <christof at damian.net> - 0.10.5-1
+ - upstream 0.10.5
+ 
+ * Fri Mar  4 2011 Christof Damian <christof at damian.net> - 0.10.3-1
+ - upstream 0.10.3
+ 
  * Mon Feb 28 2011 Christof Damian <cdamian at robin.gotham.krass.com> - 0.10.2-1
  - upstream 0.10.2