| commit | 7a2451786b146c9a1039d0f9bab4542d0e3aa1bd | [log] [tgz] |
|---|---|---|
| author | Stephan Herrmann <stephan@cs.tu-berlin.de> | Sat Aug 25 21:55:47 2012 +0200 |
| committer | Stephan Herrmann <stephan@cs.tu-berlin.de> | Sat Aug 25 21:55:47 2012 +0200 |
| tree | 361b34c959787d5dd8ef4e673755a2d81918d58a | |
| parent | 4de020060990f372c8abe9c88bac083a5d485ec6 [diff] |
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