about summary refs log tree commit diff homepage
path: root/merge.c (follow)
Commit message (Collapse)AuthorAge
* Relicense AGPLJune McEnroe2017-09-03
| | | | | | | I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft.
* Clean up merge toolJune McEnroe2017-08-31
| | | | | Choose the version with the most recent access if the modify times are the same.
* Choose B for tiles with equal modify timesJune McEnroe2017-08-31
| | | | This way newer access counts and times will be preserved.
* Add quick data file merge toolJune McEnroe2017-08-31
Hopefully I won't have to use it ever again.
nroe 2020-02-11Move hash to top of chat.hJune McEnroe 2020-02-11Move base64 out of chat.hJune McEnroe 2020-02-11Move XDG_SUBDIR out of chat.hJune McEnroe 2020-02-11Fix whois idle unit calculationJune McEnroe 2020-02-11Cast towupper to wchar_tJune McEnroe 2020-02-11Cast set but unused variables to voidJune McEnroe 2020-02-11Declare strlcatJune McEnroe 2020-02-11Check if VDSUSP existsJune McEnroe 2020-02-11Fix completeReplace iterationJune McEnroe 2020-02-11Use pkg(8) to configure on FreeBSDJune McEnroe 2020-02-11Remove legacy codeJune McEnroe 2020-02-11Add INSTALLING section to READMEJune McEnroe