summaryrefslogtreecommitdiffstats
path: root/usr.bin
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-1313-58/+58
|\
| * MFC r292950:dim2016-01-122-1/+7
| * MFC: r285552allanjude2016-01-127-10/+44
| * MFC r290408:trasz2016-01-111-1/+1
| * MFC r290404:trasz2016-01-111-5/+5
| * Unbreak stable/10 buildworlds on arm/arm, mips/mips, mips/mips64, mips/mipsel,ngie2016-01-101-41/+0
| * MFC r277610 (by jillies):dchagin2016-01-091-0/+1
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-0724-299/+157
|\ \ | |/
| * MFC: 292394gnn2016-01-072-14/+21
| * MFC r287649:markj2016-01-0710-262/+113
| * MFC r289677:bdrewery2016-01-0712-21/+21
| * bmake 20151220sjg2016-01-041-2/+2
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-12-284-13/+14
|\ \ | |/
| * MFC r291155:pfg2015-12-264-13/+14
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-12-228-16/+17
|\ \ | |/
| * MFC: xz 5.2.2.delphij2015-12-228-16/+17
* | Revert "Backport r292394 while it's not on stable/10"Renato Botelho2015-12-182-24/+14
* | Backport r292394 while it's not on stable/10Renato Botelho2015-12-172-14/+24
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-12-175-1/+10
|\ \ | |/
| * MFC r289349: mkimg: support fat16b partitions (MBR type 06h)emaste2015-12-164-0/+10
| * MFC r266566:bdrewery2015-12-141-1/+0
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-12-143-38/+106
|\ \ | |/
| * Merge bmake-20151201sjg2015-12-103-38/+106
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-12-1014-30/+21
|\ \ | |/
| * Fix mis-merge in r291816, nl_defs.h not used here.bdrewery2015-12-041-1/+1
| * MFC: r291091bapt2015-12-041-11/+5
| * MFC r291348:bdrewery2015-12-044-4/+4
| * MFC r291330:bdrewery2015-12-043-4/+3
| * MFC r284289,r288267:bdrewery2015-12-041-1/+1
| * MFC r291329:bdrewery2015-12-042-5/+0
| * MFC r291026:bdrewery2015-12-041-2/+0
| * MFC r290431:bdrewery2015-12-041-0/+1
| * MFC r290083:bdrewery2015-12-041-1/+1
| * MFC r289872:bdrewery2015-12-041-3/+7
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-11-272-2/+15
|\ \ | |/
| * MFC r291097:ume2015-11-271-1/+4
| * MFC: r289425jkim2015-11-241-1/+11
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-11-201-10/+16
|\ \ | |/
| * MFC r290367, r290370, r290437:ume2015-11-201-10/+16
* | Revert "Import a better fix for #5484"Renato Botelho2015-11-201-15/+9
* | Import a better fix for #5484Renato Botelho2015-11-201-9/+15
* | Revert "Importing pfSense patch netstat_ifname_size.diff"Renato Botelho2015-11-201-4/+4
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-11-1610-150/+360
|\ \ | |/
| * MFC r290567:ngie2015-11-163-0/+78
| * MFC r289195:ngie2015-11-157-149/+282
| * MFC r283245:ngie2015-11-151-1/+0
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-11-113-9/+36
|\ \ | |/
| * MFC r290024,290073:delphij2015-11-092-5/+12
| * MFC: r290329,r290336ache2015-11-081-4/+24
* | Merge branch 'stable/10' into develRenato Botelho2015-11-0325-3781/+1982
|\ \ | |/
OpenPOWER on IntegriCloud