]> git.street.me.uk Git - andy/viking.git/commit
Merge branch 'StatusBarInfoControl'
authorRob Norris <rw_norris@hotmail.com>
Mon, 26 Aug 2013 19:30:35 +0000 (20:30 +0100)
committerRob Norris <rw_norris@hotmail.com>
Mon, 26 Aug 2013 19:30:35 +0000 (20:30 +0100)
commit41e7014c92d44bce9aaaa8b2cc439649b6506e65
treec7933273e0768dd920e24051fd0c2ec1c55ea5dd
parent75a790673a6a8b178084c0e2ac03ff848cef6c3f
parent8549385ff967c21494f37212a6bbc9b2e303dc2d
Merge branch 'StatusBarInfoControl'

Conflicts:
help/C/viking.xml

Plus fix some minor help text grammar.
help/C/viking.xml
src/Makefile.am
src/viktrack.c
src/viktrack.h
src/viktrwlayer.c