Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-17 | 12 | -183/+194 | |
|\| | | | | | | | | | | | Conflicts: src/command/commands.c src/command/commands.h | |||||
| * | Added current window reference to command functions | James Booth | 2015-06-17 | 12 | -183/+194 | |
| | | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 2 | -10/+36 | |
|\| | ||||||
| * | Tidied cmd_otr, added check-unit target to Makefile | James Booth | 2015-06-15 | 2 | -10/+36 | |
| | | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 2 | -17/+23 | |
|\| | ||||||
| * | Removed ui_get_current_chat() | James Booth | 2015-06-15 | 2 | -17/+23 | |
| | | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 1 | -0/+57 | |
|\| | ||||||
| * | Moved UI interfaces to ui.h | James Booth | 2015-06-15 | 1 | -0/+57 | |
| | | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-14 | 1 | -1/+2 | |
|\| | ||||||
| * | Set columns when running functional tests | James Booth | 2015-06-13 | 1 | -1/+2 | |
| | | ||||||
* | | Moved stub_gpg.c | James Booth | 2015-06-12 | 1 | -0/+32 | |
| | | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-12 | 7 | -19/+30 | |
|/ | ||||||
* | Moved all tests to tests folder | James Booth | 2015-06-12 | 55 | -0/+9745 | |