aboutsummaryrefslogtreecommitdiffstats
path: root/composer/e-msg-composer-address-dialog.h
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-07-11 08:37:05 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-07-11 08:37:05 +0800
commit592a45a9c07d92648ca2e791fa04e23ebd1afe62 (patch)
tree972fd230991f88db37a6164e96add3f8f0a0b2dd /composer/e-msg-composer-address-dialog.h
parentcc233e954b5fe6be038ceb3e0239158bff74e3b3 (diff)
downloadgsoc2013-evolution-592a45a9c07d92648ca2e791fa04e23ebd1afe62.tar.gz
gsoc2013-evolution-592a45a9c07d92648ca2e791fa04e23ebd1afe62.tar.zst
gsoc2013-evolution-592a45a9c07d92648ca2e791fa04e23ebd1afe62.zip
Remove conflict marks.
svn path=/trunk/; revision=4081
Diffstat (limited to 'composer/e-msg-composer-address-dialog.h')
0 files changed, 0 insertions, 0 deletions