| commit | 0738570bd92f0c1a5fc9e037ff71392f0debafb1 | [log] [tgz] |
|---|---|---|
| author | Matthias Koller <m.koller@peak-solution.de> | Mon Jun 20 17:12:59 2016 +0200 |
| committer | Christian Weyermann <c.weyermann@peak-solution.de> | Fri Aug 19 17:23:07 2016 +0200 |
| tree | 8a890a7421b4e2991b3a68ef49828512376073bc | |
| parent | b5cff9d7fc72d3aaad2e9933f82827c4acdbd5ac [diff] |
Merge branch 'notification' of ssh://git@10.210.0.66:22/git/MDM5/org.eclipse.mdm.api.base.git into notification Conflicts: src/main/java/org/eclipse/mdm/api/base/notification/NotificationException.java src/main/java/org/eclipse/mdm/api/base/notification/NotificationFilter.java src/main/java/org/eclipse/mdm/api/base/notification/NotificationListener.java src/main/java/org/eclipse/mdm/api/base/notification/NotificationManager.java