diff options
| author | LaMont Jones <lamont@debian.org> | 2008-04-15 22:59:28 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2008-04-15 22:59:28 -0600 |
| commit | 769434fc28227d4f83ca6da9d7271b734811fd1c (patch) | |
| tree | 0eaf54de54c4368cb8ba7747ffcb1874bf34b81c /hwclock | |
| parent | 086916a81fb67e2e2a371ec4605b766188adddb0 (diff) | |
| parent | 42bcaa2ca12865ec09244a66314dafcf05024e4e (diff) | |
| download | util-linux-old-769434fc28227d4f83ca6da9d7271b734811fd1c.tar.gz | |
Merge commit 'origin/master'
Conflicts:
mount/lomount.c
mount/lomount.h
mount/mount.c
Diffstat (limited to 'hwclock')
| -rw-r--r-- | hwclock/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hwclock/.gitignore b/hwclock/.gitignore new file mode 100644 index 00000000..97f59f33 --- /dev/null +++ b/hwclock/.gitignore @@ -0,0 +1 @@ +hwclock |