summaryrefslogtreecommitdiffstats
path: root/po/merge.sh
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-12 17:54:48 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-12 17:54:48 -0500
commit01f81b6d539881444effcdba5df17d23821ecf3b (patch)
treed50899a20b6de710f2baa4335597c44ea1b095a9 /po/merge.sh
parentd98f61c9ff1fe09d5a9305d06a8061ea1f9e1cf3 (diff)
parentc2c7911cdf6b2ebec0a491d20c5e4145087d0ca6 (diff)
downloadpiklab-01f81b6d539881444effcdba5df17d23821ecf3b.tar.gz
piklab-01f81b6d539881444effcdba5df17d23821ecf3b.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/piklab
Diffstat (limited to 'po/merge.sh')
0 files changed, 0 insertions, 0 deletions