diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2015-02-23 15:00:56 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2015-02-23 15:00:56 +0100 |
| commit | 119552f74c71c24698f4b424411786bfb4baea6b (patch) | |
| tree | bf312c79c7fe6fcb819c6f1b8e3cc9f8e4888e0e /.gitattributes | |
| parent | 241f8b6c35895b932ac7f27de1ee76416cae419a (diff) | |
| parent | fe05bc51ee70190516d6cc65f03e343bfdc4f849 (diff) | |
| download | mupdf-119552f74c71c24698f4b424411786bfb4baea6b.tar.xz | |
Merge branch 'html'
Conflicts:
Makefile
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions