commit | 397461947ca6b70e31344c52854da9e8163664bb | [log] [tgz] |
---|---|---|
author | Werner Lemberg <wl@gnu.org> | Mon Jun 20 19:20:50 2011 +0200 |
committer | Werner Lemberg <wl@gnu.org> | Mon Jun 20 19:20:50 2011 +0200 |
tree | 3842202ae49128877d48724002e50a6c5dcfd4ac | |
parent | 4696dde23d4dd71fc68912004e0db454e122204e [diff] | |
parent | c7e8028f3fef9fa8e29fc346ac08ff8890f7c7e5 [diff] |
Merge branch 'master' of git.sv.gnu.org:/srv/git/freetype/freetype2 Conflicts: ChangeLog