diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-06-07 12:42:40 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-06-07 12:42:40 -0400 |
| commit | 97d26ce9e3589e9f5fa17014467a9730a884d158 (patch) | |
| tree | 1321a9170832aebc6c5017a70d6d73957cf31ba4 /lib/ext2fs/expanddir.c | |
| parent | c561e751a17c85b898d74f8cc16daad5f29500a4 (diff) | |
| parent | 296b9d696ab491f29d6d2083982e39b0ff3dab1f (diff) | |
| download | e2fsprogs-97d26ce9e3589e9f5fa17014467a9730a884d158.tar.gz | |
Merge branch 'maint' into next
Conflicts:
e2fsck/journal.c
e2fsck/pass1.c
e2fsck/pass2.c
misc/mke2fs.c
Diffstat (limited to 'lib/ext2fs/expanddir.c')
| -rw-r--r-- | lib/ext2fs/expanddir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c index baee5fe1..d41d95ef 100644 --- a/lib/ext2fs/expanddir.c +++ b/lib/ext2fs/expanddir.c @@ -4,8 +4,8 @@ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999 Theodore Ts'o. * * %Begin-Header% - * This file may be redistributed under the terms of the GNU Public - * License. + * This file may be redistributed under the terms of the GNU Library + * General Public License, version 2. * %End-Header% */ |