]> www.infradead.org Git - pidgin-chime.git/commitdiff
Merge branch 'wip/nacho/fixups' of github.com:awslabs/pidgin-chime
authorDavid Woodhouse <dwmw@amazon.co.uk>
Tue, 26 May 2020 10:51:21 +0000 (11:51 +0100)
committerDavid Woodhouse <dwmw@amazon.co.uk>
Tue, 26 May 2020 10:51:21 +0000 (11:51 +0100)
1  2 
prpl/chime.c
prpl/chime.h

diff --cc prpl/chime.c
Simple merge
diff --cc prpl/chime.h
Simple merge