summaryrefslogtreecommitdiffstats
path: root/locale/local.mk
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2015-05-26 00:45:29 (EDT)
committer P. J. McDermott <pj@pehjota.net>2015-05-26 00:45:29 (EDT)
commitecb7de9b4e304faec007f734489e0a025efa70c4 (patch)
tree47e38dac8630345acb34b7d471d3d64194cadaec /locale/local.mk
parent3da6f63bdcde6a106b746372aa278ba669aa21d1 (diff)
parent83bcfb556cfc36246c99cf92f0bc0ec8a8e6d755 (diff)
Merge branch 'master' into feature/installer-integration
Conflicts: lib/cmd/install.sh
Diffstat (limited to 'locale/local.mk')
0 files changed, 0 insertions, 0 deletions