aboutsummaryrefslogtreecommitdiff
path: root/id/oa/src/main/java
AgeCommit message (Expand)AuthorFilesLines
2014-02-03Solve some merge problemsThomas Lenz1-0/+2
2014-02-03Merge remote-tracking branch 'remotes/origin/outgoingstork' into moa2_0_tlenzThomas Lenz2-22/+19
2014-01-29add EUPL headersThomas Lenz11-22/+272
2014-01-29fixed issues after mergeFlorian Reimair2-22/+19
2014-01-27add PVP2 Demo ApplicationThomas Lenz11-0/+1558