diff options
| author | Dennis Real <github@tildepipe.org> | 2012-02-26 19:08:22 +0100 | 
|---|---|---|
| committer | Dennis Real <github@tildepipe.org> | 2012-02-26 19:08:22 +0100 | 
| commit | fc651e5eb5a7cce4f2df97eb8aee3d9ad34f9717 (patch) | |
| tree | d920a9d3c789dc9856871fdc24e73990426075dd /man | |
| parent | 458c5cfd464c84048c7e9027f6ef803d261742e3 (diff) | |
| parent | 54deb9b8e21354a1670c179a7d8bd09e4e391026 (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
	src/exif.c
Diffstat (limited to 'man')
| -rw-r--r-- | man/feh.pre | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/man/feh.pre b/man/feh.pre index e460fad..acb4948 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -791,7 +791,8 @@ Number of image pixels  .  .It \&%P  . -.Nm +Numbor of image pixels +.Pq kilopixels / megapixels  .  .It %s  . @@ -799,8 +800,8 @@ Image size in bytes  .  .It %S  . -Image size in kilobytes -.Pq with kB postfix +Human-readable image size +.Pq kB / MB  .  .It %t  . | 
