| commit | 604d2219a9ab59a0b0c71dca8b59aa61cc085a0d | |
| author | Henrik Tidefelt <tidefelt@isy.liu.se> | |
| Fri, 29 Aug 2008 21:04:30 +0000 (29 23:04 +0200) | ||
| committer | Henrik Tidefelt <tidefelt@isy.liu.se> | |
| Fri, 29 Aug 2008 21:04:30 +0000 (29 23:04 +0200) | ||
| tree | c1eb0252512df64b579a3580c3174f902a2dd0d0 | treesnapshot (tar.gz zip) |
| parent | 81e375346c6d34e7225ac692620d7546f224da95 | commitdiff |
| parent | ca0356e461b822b0748caa8bde116400978abf4b | commitdiff |
Merge branch 'next' of tidefelt@keyisy.liu.se:Library/git-repository/shapes into next
Easy merge.
* 'next' of tidefelt@keymaster.isy.liu.se:Library/git-repository/shapes:
Mainly work related to documentation of arrowheads.
Conflicts:
doc/parts/extensions/arrowheads.sxml
doc/parts/tutorial/chap-install.sxml
Easy merge.
* 'next' of tidefelt@keymaster.isy.liu.se:Library/git-repository/shapes:
Mainly work related to documentation of arrowheads.
Conflicts:
doc/parts/extensions/arrowheads.sxml
doc/parts/tutorial/chap-install.sxml