diff options
author | sjg <sjg@FreeBSD.org> | 2013-09-05 20:18:59 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2013-09-05 20:18:59 +0000 |
commit | 62bb1062226d3ce6a2350808256a25508978352d (patch) | |
tree | 22b131dceb13c3df96da594fbaadb693504797c7 /usr.bin/sort | |
parent | 72ab90509b3a51ab361bf710338f2ef44a4e360d (diff) | |
parent | 04932445481c2cb89ff69a83b961bdef3d64757e (diff) | |
download | FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.zip FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.tar.gz |
Merge from head
Diffstat (limited to 'usr.bin/sort')
-rw-r--r-- | usr.bin/sort/bwstring.c | 2 | ||||
-rw-r--r-- | usr.bin/sort/bwstring.h | 2 | ||||
-rw-r--r-- | usr.bin/sort/coll.c | 2 | ||||
-rw-r--r-- | usr.bin/sort/coll.h | 2 | ||||
-rw-r--r-- | usr.bin/sort/file.c | 2 | ||||
-rw-r--r-- | usr.bin/sort/file.h | 2 | ||||
-rw-r--r-- | usr.bin/sort/mem.c | 2 | ||||
-rw-r--r-- | usr.bin/sort/mem.h | 2 | ||||
-rw-r--r-- | usr.bin/sort/radixsort.c | 2 | ||||
-rw-r--r-- | usr.bin/sort/radixsort.h | 2 | ||||
-rw-r--r-- | usr.bin/sort/sort.1.in | 2 | ||||
-rw-r--r-- | usr.bin/sort/sort.c | 2 | ||||
-rw-r--r-- | usr.bin/sort/sort.h | 2 | ||||
-rw-r--r-- | usr.bin/sort/vsort.c | 2 | ||||
-rw-r--r-- | usr.bin/sort/vsort.h | 6 |
15 files changed, 17 insertions, 17 deletions
diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c index 121aec8..3def9d0 100644 --- a/usr.bin/sort/bwstring.c +++ b/usr.bin/sort/bwstring.c @@ -1,6 +1,6 @@ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sort/bwstring.h b/usr.bin/sort/bwstring.h index 7359523..93098f3 100644 --- a/usr.bin/sort/bwstring.h +++ b/usr.bin/sort/bwstring.h @@ -2,7 +2,7 @@ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c index a619fcf..b3c80f6 100644 --- a/usr.bin/sort/coll.c +++ b/usr.bin/sort/coll.c @@ -1,6 +1,6 @@ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sort/coll.h b/usr.bin/sort/coll.h index a3ceaaf..9299742 100644 --- a/usr.bin/sort/coll.h +++ b/usr.bin/sort/coll.h @@ -2,7 +2,7 @@ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index 2d185e4..d989008 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -1,6 +1,6 @@ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sort/file.h b/usr.bin/sort/file.h index 8e95fdb..ae33a2a 100644 --- a/usr.bin/sort/file.h +++ b/usr.bin/sort/file.h @@ -2,7 +2,7 @@ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sort/mem.c b/usr.bin/sort/mem.c index 999aea2..93cb019 100644 --- a/usr.bin/sort/mem.c +++ b/usr.bin/sort/mem.c @@ -1,6 +1,6 @@ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sort/mem.h b/usr.bin/sort/mem.h index 13ba4a9..44eb544 100644 --- a/usr.bin/sort/mem.h +++ b/usr.bin/sort/mem.h @@ -2,7 +2,7 @@ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sort/radixsort.c b/usr.bin/sort/radixsort.c index b370723..fde2b6f 100644 --- a/usr.bin/sort/radixsort.c +++ b/usr.bin/sort/radixsort.c @@ -1,5 +1,5 @@ /*- - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org> * All rights reserved. * diff --git a/usr.bin/sort/radixsort.h b/usr.bin/sort/radixsort.h index 5276d71..ff881a3 100644 --- a/usr.bin/sort/radixsort.h +++ b/usr.bin/sort/radixsort.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /*- - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org> * All rights reserved. * diff --git a/usr.bin/sort/sort.1.in b/usr.bin/sort/sort.1.in index 6dd7657..887621f 100644 --- a/usr.bin/sort/sort.1.in +++ b/usr.bin/sort/sort.1.in @@ -612,7 +612,7 @@ command first appeared in .Sh AUTHORS Gabor Kovesdan <gabor@FreeBSD.org>, .Pp -Oleg Moskalenko <oleg.moskalenko@citrix.com> +Oleg Moskalenko <mom040267@gmail.com> .Sh NOTES This implementation of .Nm diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index 7e0ab69..d811a86 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -1,6 +1,6 @@ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h index a37f922..e339ff7 100644 --- a/usr.bin/sort/sort.h +++ b/usr.bin/sort/sort.h @@ -2,7 +2,7 @@ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sort/vsort.c b/usr.bin/sort/vsort.c index 593e54c..5d15f9a 100644 --- a/usr.bin/sort/vsort.c +++ b/usr.bin/sort/vsort.c @@ -1,5 +1,5 @@ /*- - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org> * All rights reserved. * diff --git a/usr.bin/sort/vsort.h b/usr.bin/sort/vsort.h index facd075..17f58e5 100644 --- a/usr.bin/sort/vsort.h +++ b/usr.bin/sort/vsort.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /*- - * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com> + * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org> * All rights reserved. * @@ -27,8 +27,8 @@ * SUCH DAMAGE. */ -#if !defined(__VSORT_H__) -#define _VSORT_H__ +#ifndef _VSORT_H_ +#define _VSORT_H_ #include "bwstring.h" |