| commit | eb475ea5a59316244f8b179d0a62e2005d306ce6 | [log] [tgz] |
|---|---|---|
| author | Christopher Guindon <chris.guindon@eclipse.org> | Wed Jun 11 10:16:14 2014 -0400 |
| committer | Christopher Guindon <chris.guindon@eclipse.org> | Wed Jun 11 10:16:14 2014 -0400 |
| tree | bf98d2dbd1d08b4545a1a851b4d41f38b2722154 | |
| parent | 69b0eeba8dca00d7455ac5ba8c218db3a36309ce [diff] | |
| parent | 18b42bf2546630268cc90d539c747bfca0d4cd65 [diff] |
Merge branch 'solstice' Conflicts: .settings/org.eclipse.wst.common.project.facet.core.xml