| author | Xavier Boudet <x-boudet@ti.com> | |
| Wed, 21 Mar 2012 08:29:47 +0000 (08:29 +0000) | ||
| committer | Xavier Boudet <x-boudet@ti.com> | |
| Wed, 21 Mar 2012 08:29:47 +0000 (08:29 +0000) | ||
| commit | 253618e02c310fcdf1dbd5a8dd115a87761cb3be | |
| tree | d3ff4d55dcc98e75b82ac8f4cbdfd46e0fe27800 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 1e5dcb6e78f6598a0e1571911fa1d6926d80b9d1 | commit | diff |
| parent | fc5f22f2edd77aebda1a455542262963fb620d1f | commit | diff |
Merge branch 'ubuntu'
Conflicts:
debian/changelog
Conflicts:
debian/changelog
| debian/changelog | diff1 | | diff2 | | blob | history |