author | Xavier Boudet <x-boudet@ti.com> | |
Wed, 9 May 2012 07:22:04 +0000 (09:22 +0200) | ||
committer | Xavier Boudet <x-boudet@ti.com> | |
Wed, 9 May 2012 07:22:04 +0000 (09:22 +0200) | ||
commit | 188647ae316921821851c1e210b3908255cdcfc1 | |
tree | ad8bc74064307ea11e2d757ca1a8249a1b686018 | tree | snapshot (tar.xz tar.gz zip) |
parent | 46fc385f41a6a1a7e377cde09e6eb187e1fc40fb | commit | diff |
parent | ce53fae56b735456907a879557c67cbb30801a0a | 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 |