Commit [f49c4b] master History

Merge branch 'master' of /home/johannes/work/osp/timbus-dpes-preservation-identifier-parent/server with conflicts.

Johannes Binder Johannes Binder 2014-05-27

Browse code at this revision

Parent(s): [010ff5][4c49f2]

Child(ren): [bee689]

changed .settings/org.eclipse.jdt.ui.prefs
changed src/net/timbusproject/dpes/alternative/PreservationIdentifierService.java
changed .project
changed src/net/timbusproject/dpes/alternative/AlternativesBuilder/AlternativesBuilderHelper.java
changed src/net/timbusproject/dpes/alternative/AlternativesBuilder/PackageAlternativesBuilder.java
changed src/net/timbusproject/dpes/alternative/AlternativesBuilder/ToolAlternativesBuilder.java
changed src/net/timbusproject/dpes/alternative/PreservationIdentifierService.java
.settings/org.eclipse.jdt.ui.prefs Diff Switch to side-by-side view
Loading...
src/net/timbusproject/dpes/alternative/PreservationIdentifierService.java Diff Switch to side-by-side view
Loading...
.project Diff Switch to side-by-side view
Loading...
src/net/timbusproject/dpes/alternative/AlternativesBuilder/AlternativesBuilderHelper.java Diff Switch to side-by-side view
Loading...
src/net/timbusproject/dpes/alternative/AlternativesBuilder/PackageAlternativesBuilder.java Diff Switch to side-by-side view
Loading...
src/net/timbusproject/dpes/alternative/AlternativesBuilder/ToolAlternativesBuilder.java Diff Switch to side-by-side view
Loading...
src/net/timbusproject/dpes/alternative/PreservationIdentifierService.java Diff Switch to side-by-side view
Loading...