diff options
author | Santhosh Thottingal <santhosh.thottingal@gmail.com> | 2013-10-07 17:59:53 +0530 |
---|---|---|
committer | Santhosh Thottingal <santhosh.thottingal@gmail.com> | 2013-10-07 17:59:53 +0530 |
commit | 7f7b6d635c6780890833945736c397ace3547f85 (patch) | |
tree | f734f8d63ee9e26caab194472f3225a925c6b1f7 /Makefile | |
parent | 50f225a64dae028d3956d133b48729bb0ca2d396 (diff) | |
parent | b4b39fc462049f01e6e35046410dfad7fc8fffa0 (diff) | |
download | Rachana.git-7f7b6d635c6780890833945736c397ace3547f85.tar.gz Rachana.git-7f7b6d635c6780890833945736c397ace3547f85.tar.xz Rachana.git-7f7b6d635c6780890833945736c397ace3547f85.zip |
Merge branch 'mlm2' of ssh://git.sv.gnu.org/srv/git/smc/fonts into mlm2
Conflicts:
Rachana/Rachana.sfd
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions