| commit | 405c920e4161de3fafa0bb5bea21ec54d5acbd4a | [log] [tgz] |
|---|---|---|
| author | Eugene Tarassov <eugene.tarassov@windriver.com> | Tue Jan 10 11:54:24 2012 -0800 |
| committer | Eugene Tarassov <eugene.tarassov@windriver.com> | Tue Jan 10 11:54:24 2012 -0800 |
| tree | 79fb2231fb67ef256e59ea6bfc8eb8dc4a46918b | |
| parent | 6a935544e30ad0dc59353e1271bfd85bc7e96d24 [diff] | |
| parent | 0274cd2d87349af3abdb566ec259fbdee480e97f [diff] |
Merge remote branch 'remotes/origin/master' into juno-refactoring Conflicts: pom.xml