diff options
author | Stephan Herrmann | 2012-08-25 19:55:47 +0000 |
---|---|---|
committer | Stephan Herrmann | 2012-08-25 19:55:47 +0000 |
commit | 7a2451786b146c9a1039d0f9bab4542d0e3aa1bd (patch) | |
tree | 361b34c959787d5dd8ef4e673755a2d81918d58a /testplugins | |
parent | 4de020060990f372c8abe9c88bac083a5d485ec6 (diff) | |
download | org.eclipse.objectteams-7a2451786b146c9a1039d0f9bab4542d0e3aa1bd.tar.gz org.eclipse.objectteams-7a2451786b146c9a1039d0f9bab4542d0e3aa1bd.tar.xz org.eclipse.objectteams-7a2451786b146c9a1039d0f9bab4542d0e3aa1bd.zip |
Fix regression in CallinMappingTest.testExistenceOfMappings and a typo
in CalloutMapping.<init>
Resolved merge conflicts:
org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java
org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/CalloutMapping.java
org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/CalloutToFieldMapping.java
Diffstat (limited to 'testplugins')
0 files changed, 0 insertions, 0 deletions