summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'tagtest3'HEADmasterRobin H. Johnson2017-05-211-1/+1
|\
| * Test2.Robin H. Johnson2017-05-211-1/+1
|/
* Merge tag 'branch-tag'Robin H. Johnson2015-10-061-1/+1
|\
| * Merge branch 'master' into testtestRobin H. Johnson2015-05-051-1/+1
| |\ | |/ |/|
* | Make a conflict.Robin H. Johnson2015-05-051-1/+1
| * Make a conflict.Robin H. Johnson2015-05-051-1/+1
|/
* Merge remote-tracking branch 'origin/test'Robin H. Johnson2015-05-050-0/+0
|\
| * Test, part #2.Robin H. Johnson2015-05-051-0/+1
| * Test.Robin H. Johnson2015-05-051-0/+0
* | Test, part #3.Robin H. Johnson2015-05-051-0/+1
|/
* CleanupAlex Legler2015-03-102-3/+0
* Orange!Alex Legler2015-03-102-2/+2
* Yellow?Alex Legler2015-03-102-2/+2
* Testing againAlex Legler2015-03-102-1/+2
* Testing paths bold, message plainAlex Legler2015-03-102-0/+2
* Foo bar baz!INITIAL-unannotatedINITIAL-annotatedAlex Legler2015-03-102-0/+0