Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 3 | -24/+37 |
|\ | |||||
| * | Added roster list function to get display name for messages | James Booth | 2015-05-03 | 3 | -24/+37 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -52/+52 |
|\| | |||||
| * | Added carbons handler | James Booth | 2015-05-03 | 1 | -52/+52 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -1/+6 |
|\| | |||||
| * | Show resource in status bar | James Booth | 2015-05-03 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -12/+31 |
|\| | |||||
| * | Extracted receipt request processing in message.c | James Booth | 2015-05-03 | 1 | -12/+31 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 3 | -82/+87 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Extract private message hanlding in message.c | James Booth | 2015-05-03 | 3 | -70/+75 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -40/+50 |
|generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-09-21 12:32:51 +0000 |