aboutsummaryrefslogtreecommitdiff
path: root/COPYING-GPL3
diff options
context:
space:
mode:
authorCody Russell <crussell@canonical.com>2010-06-21 14:47:08 -0500
committerCody Russell <crussell@canonical.com>2010-06-21 14:47:08 -0500
commitc4eb1c83cb2bc10c1cfb2346a83182f09e159e53 (patch)
tree5e640a3f32b597dd406cbd425d1ced9b5e5ab3ff /COPYING-GPL3
parentcfdd33a19758224cb835efa705a410d3d4d0db91 (diff)
parent3d800bf9b0133a613d28c31957c081d157a89af8 (diff)
downloadlibdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.gz
libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.bz2
libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.zip
Mainline merge, resolve conflicts.
Diffstat (limited to 'COPYING-GPL3')
0 files changed, 0 insertions, 0 deletions