Edwin Kempin b8afa2f78f Merge "Refactoring of CherryPick merge-strategy"

2012-11-15 12:09:05 -08:00

..

.settings

Remove timestamp from all org.eclipse.core.resources.prefs files.

2012-07-04 14:06:09 +02:00

src

Merge "Refactoring of CherryPick merge-strategy"

2012-11-15 12:09:05 -08:00

.gitignore

Add Intellij IDEA files to ignore list

2012-05-03 13:17:43 -07:00

pom.xml

Fix warnings caused by wrong BouncyCastle version in pom files

2012-10-21 20:14:37 -07:00