summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-21 13:39:57 -0600
committerTimothy Pearson <[email protected]>2013-02-21 13:39:57 -0600
commitc0641e617e036ed721ec9f8d4eac4a290deb5c7b (patch)
treef4c576399fde2f42825df7b55fdfd42050a4ee5e /Makefile.am
parent5c467e3693a7f8a14577d76ba9d65b8400bac319 (diff)
parent01adb516f67bb6ba999f4fe90d085a506c5335c9 (diff)
downloadkopete-otr-c0641e617e036ed721ec9f8d4eac4a290deb5c7b.tar.gz
kopete-otr-c0641e617e036ed721ec9f8d4eac4a290deb5c7b.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kopete-otr
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions