author | Xavier Boudet <x-boudet@ti.com> | |
Mon, 21 Jan 2013 13:26:47 +0000 (14:26 +0100) | ||
committer | Xavier Boudet <x-boudet@ti.com> | |
Mon, 21 Jan 2013 13:26:47 +0000 (14:26 +0100) | ||
commit | 1a1a84c71b94c1108e7708e368b2d7ed9b858900 | |
tree | 7af7b68989c2d57df142bcd4263b1836945f9cb0 | tree | snapshot (tar.xz tar.gz zip) |
parent | 601ce0d17321a89ca5ccf0e8b7412580c443b3a2 | commit | diff |
parent | 5690ab8c3516895384367aac85bfcef910d466e5 | commit | diff |
Merge branch 'ubuntu'
Conflicts:
debian/changelog
debian/patches/series
Conflicts:
debian/changelog
debian/patches/series
debian/changelog | diff1 | | diff2 | | blob | history |
debian/patches/series | diff1 | | diff2 | | blob | history |