diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-01-16 22:27:12 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-01-16 22:27:12 -0500 |
| commit | a6170ec03bc3853b697c14ce93c707cb94da4baf (patch) | |
| tree | aab138a77dd843f05fdcc83e8ca2081ba41d71df /LICENSE.bsd3.txt | |
| parent | 71e4583a0c3b24cc55cc1701f3ed129baa45d0b7 (diff) | |
| parent | 2d33bd2f34f011c4f025a073b50d536f6a66a4db (diff) | |
Merge remote-tracking branch 'r-autothing/v3/master'
# Conflicts:
# .gitignore
# Makefile
# README.md
# build-aux/Makefile.README.txt
Diffstat (limited to 'LICENSE.bsd3.txt')
0 files changed, 0 insertions, 0 deletions