aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-01-16 16:03:28 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-01-16 16:03:28 +0800
commitb5be743912a828d44439693a7c5da2d8fafba7ca (patch)
tree41bc3073be301951090e49311b9d9a75ce747d49
parente08ec076dbf22f4f4bcdaf4ec11ccb4debc2c713 (diff)
parentc3716f8a8add2a6fbebef81b05281d777c8369ba (diff)
downloadgsoc2013-empathy-b5be743912a828d44439693a7c5da2d8fafba7ca.tar
gsoc2013-empathy-b5be743912a828d44439693a7c5da2d8fafba7ca.tar.gz
gsoc2013-empathy-b5be743912a828d44439693a7c5da2d8fafba7ca.tar.bz2
gsoc2013-empathy-b5be743912a828d44439693a7c5da2d8fafba7ca.tar.lz
gsoc2013-empathy-b5be743912a828d44439693a7c5da2d8fafba7ca.tar.xz
gsoc2013-empathy-b5be743912a828d44439693a7c5da2d8fafba7ca.tar.zst
gsoc2013-empathy-b5be743912a828d44439693a7c5da2d8fafba7ca.zip
Merge branch 'gnome-3-6'
Conflicts: NEWS configure.ac
0 files changed, 0 insertions, 0 deletions