diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2012-02-26 22:34:28 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2012-02-26 22:34:28 +0100 |
| commit | 3ceed32cd8f56cd4c970b31ed03c15549bcb396d (patch) | |
| tree | 57542d7d6a0434facc5a4d8e7b75c9e85a7f7eb4 /test/list/filename_recursive | |
| parent | b257e011c4390900f14491e2cffe38b2d00892ec (diff) | |
| parent | f24e46871c9eb41f2b43e91b18164c3d232255f8 (diff) | |
Merge branch 'master' of aneurysm:var/git_root/feh
Diffstat (limited to 'test/list/filename_recursive')
| -rw-r--r-- | test/list/filename_recursive | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/list/filename_recursive b/test/list/filename_recursive index 5ffa63e..d4d27dd 100644 --- a/test/list/filename_recursive +++ b/test/list/filename_recursive @@ -1,6 +1,6 @@ -NUM FORMAT WIDTH HEIGHT PIXELS SIZE(bytes) ALPHA FILENAME -1 gif 16 16 256 953 - test/ok/gif -2 jpeg 16 16 256 354 - test/ok/jpg -3 png 16 16 256 403 X test/ok/png -4 pnm 16 16 256 269 - test/ok/pnm -5 png 16 16 256 403 X test/ok/recursive/png +NUM FORMAT WIDTH HEIGHT PIXELS SIZE ALPHA FILENAME +1 gif 16 16 256 953 - test/ok/gif +2 jpeg 16 16 256 354 - test/ok/jpg +3 png 16 16 256 403 X test/ok/png +4 pnm 16 16 256 269 - test/ok/pnm +5 png 16 16 256 403 X test/ok/recursive/png |