| commit | dde5115134fcd0f55a6a95b09cb35dc9a656227e | [log] [tgz] |
|---|---|---|
| author | adamb <adamb@apache.org> | Fri Mar 08 13:29:50 2013 -0600 |
| committer | adamb <adamb@apache.org> | Fri Mar 08 13:29:50 2013 -0600 |
| tree | 81a216d152197c732f2a876b9790c43310a6c1af | |
| parent | d02ff68867a61c4a0ebac51f537570719fa16a3e [diff] | |
| parent | fa78301161aa917c0ef8e34f2df1afc0f687d0c0 [diff] |
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-hdt Conflicts: org.apache.hdt.help/.classpath org.apache.hdt.ui/.classpath