]> git.street.me.uk Git - andy/viking.git/commitdiff
Merge branch 'TrackLabelling'
authorRob Norris <rw_norris@hotmail.com>
Mon, 26 Aug 2013 19:22:09 +0000 (20:22 +0100)
committerRob Norris <rw_norris@hotmail.com>
Mon, 26 Aug 2013 19:22:09 +0000 (20:22 +0100)
1  2 
help/C/viking.xml
src/viktrack.c
src/viktrack.h
src/viktrwlayer.c

Simple merge
diff --cc src/viktrack.c
Simple merge
diff --cc src/viktrack.h
Simple merge
Simple merge