| commit | 062a86f067b999da5c6bb1372c7c08d0f64dfa82 | [log] [tgz] |
|---|---|---|
| author | Jonas Ruettimann <jonas.ruettimann@fhsg.ch> | Wed Jul 06 07:46:56 2011 +0200 |
| committer | Jonas Ruettimann <jonas.ruettimann@fhsg.ch> | Wed Jul 06 07:46:56 2011 +0200 |
| tree | 5fa9b52a20db617932dc55138193f93c232348df | |
| parent | 2dee2928bc1c33992e8d1522cd689a8633647548 [diff] | |
| parent | fb78f54732fa8ce578412c288c6f704d7941ea1e [diff] |
Merge branch 'master' of git://git.eclipse.org/gitroot/amp/org.eclipse.amp Conflicts: org.eclipse.amp.agf.test/src/org/eclipse/amp/agf/chart/test/ResourceManagerTest.java org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.chart/test/org/eclipse/amp/agf/chart/ResourceManagerTest.java org.eclipse.amp.agf/tests/org.eclipse.amp.agf.chart.test/src/org/eclipse/amp/agf/chart/ResourceManagerTest.java