summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSanthosh Thottingal <santhosh.thottingal@gmail.com>2013-10-07 17:59:53 +0530
committerSanthosh Thottingal <santhosh.thottingal@gmail.com>2013-10-07 17:59:53 +0530
commit7f7b6d635c6780890833945736c397ace3547f85 (patch)
treef734f8d63ee9e26caab194472f3225a925c6b1f7 /Makefile
parent50f225a64dae028d3956d133b48729bb0ca2d396 (diff)
parentb4b39fc462049f01e6e35046410dfad7fc8fffa0 (diff)
downloadRachana.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