summary refs log tree commit diff stats
path: root/src/fe-text/makefile.mak
diff options
context:
space:
mode:
authorberkeviktor@aol.com <berkeviktor@aol.com>2010-09-28 16:38:22 +0200
committerberkeviktor@aol.com <berkeviktor@aol.com>2010-09-28 16:38:22 +0200
commit3ca6f5dda9651837235ff30aeda056af036099f1 (patch)
treebd07b375f7fe849eb7c047877cafb2583e0c2505 /src/fe-text/makefile.mak
parent1fea687f824468138be992af4cd8d7d31f97dd1f (diff)
bad conflict resolve, missing header for udiff
Diffstat (limited to 'src/fe-text/makefile.mak')
0 files changed, 0 insertions, 0 deletions