The following commit has been merged in the master branch:
commit 2f9ee47dc7f1878eb0473b61462f647823d610e2
Merge: 5c2db8507b4b978d0a0a7548b338304d7100a0b3 
484fcfb3ecf89010918d6e6f0181705b1ed98697
Author: Damien Raude-Morvan <[email protected]>
Date:   Fri May 25 00:53:13 2012 +0200

    Merge branch 'dfsg_clean'

diff --combined .gitignore
index 845ca06,1af5e76..60b9923
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,22 +1,23 @@@
 +.pc
+ *~
+ *.swp
+ .idea
+ .idea/*
+ *.iml
+ *.ipr
+ *.iws
+ target
+ .DS_Store
+ .project
+ .classpath
+ .settings
+ eclipse-classes
+ activemq-core/ActiveMQConnections.dot
+ activemq-core/KahaDB
+ activemq-core/broker
+ activemq-core/derby.log
+ activemq-core/derbyDb
+ activemq-core/networkedBroker
+ activemq-core/shared
+ activemq-data
+ data/

-- 
Debian packaging for activemq

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to