| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | sync with Reality; |   xsa | 2005-11-02 | 1 | -3/+5 | |
| | | ||||||
| * | diff3_conflicts cleanup; joris ok | xsa | 2005-10-26 | 1 | -3/+1 | |
| | | ||||||
| * | add extern int diff3_conflicts to unbreak. bad joris. |   niallo | 2005-10-23 | 1 | -1/+2 | |
| | | ||||||
| * | correct error message; | xsa | 2005-10-23 | 1 | -2/+2 | |
| | | ||||||
| * | warn if conflicts were found during the merge; |   joris | 2005-10-23 | 1 | -1/+6 | |
| | | ||||||
| * | with recent diff3 support, rcsmerge now works; | joris | 2005-10-23 | 1 | -6/+50 | |
| | | ||||||
| * | skeletons for rcsmerge(1); | xsa | 2005-10-18 | 1 | -0/+110 | |
 |
index : wireguard-openbsd | |
| WireGuard implementation for the OpenBSD kernel | Matt Dunwoodie |
| summaryrefslogtreecommitdiffstats |