| commit | 55eb40eddb422045a9336617faa6f6cbf6711258 | |
| author | Henrik Tidefelt <tidefelt@isy.liu.se> | |
| Mon, 24 May 2010 22:03:09 +0000 (25 00:03 +0200) | ||
| committer | Henrik Tidefelt <tidde@59-50.isylogon.isy.liu.se> | |
| Wed, 2 Jun 2010 10:45:41 +0000 (2 12:45 +0200) | ||
| tree | c2aa625854df843f0dc2a92801ac5cfddf6c6899 | treesnapshot (tar.gz zip) |
| parent | 34668b430d53491a8375b424a1c8fa73fd8927a4 | commitdiff |
Fixing undetected conflict due to new use of character and word spacing, see 110852a6.
| source/texttypes.cc | diffblobblamehistory |