about summary refs log tree commit diff stats
path: root/tests/unittests/test_cmd_join.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into openpgpJames Booth2015-06-171-6/+6
|\ | | | | | | | | | | Conflicts: src/command/commands.c src/command/commands.h
| * Added current window reference to command functionsJames Booth2015-06-171-6/+6
| |
* | Merge branch 'master' into openpgpJames Booth2015-06-121-4/+4
|/
* Moved all tests to tests folderJames Booth2015-06-121-0/+184