diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2014-08-19 16:54:24 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2014-08-19 16:54:24 +0000 |
| commit | 336daad8d7aad48fceb5537c6c212b97418cc853 (patch) | |
| tree | 4120fde4818a152f076a6cb10c3d61a2565370d7 /cad | |
| parent | Simplify some patches (diff) | |
Chase conflicts.
Notes
Notes:
svn path=/head/; revision=365400
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/kicad-devel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 4cea8d9aa471..5d10800f3e8c 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= bzr:${PORTSDIR}/devel/bzr \ LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs -CONFLICTS= kicad-2013* +CONFLICTS= kicad-2014* DOCVERSION= 1.1 LIBVERSION= 1.0 |