diff options
Diffstat (limited to 'metadata/md5-cache/sci-visualization/fityk-1.2.9')
| -rw-r--r-- | metadata/md5-cache/sci-visualization/fityk-1.2.9 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/sci-visualization/fityk-1.2.9 b/metadata/md5-cache/sci-visualization/fityk-1.2.9 index f326a17d848f..7c4a6fdb1ba7 100644 --- a/metadata/md5-cache/sci-visualization/fityk-1.2.9 +++ b/metadata/md5-cache/sci-visualization/fityk-1.2.9 @@ -10,5 +10,9 @@ RDEPEND=>=sci-libs/xylib-1 >=dev-lang/lua-5.1:0 nlopt? ( sci-libs/nlopt ) python REQUIRED_USE=python? ( || ( python_targets_python2_7 ) ) SLOT=0 SRC_URI=https://github.com/wojdyr/fityk/releases/download/v1.2.9/fityk-1.2.9.tar.bz2 +<<<<<<< HEAD _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 +======= +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 +>>>>>>> next _md5_=ec88435baa0ef85262441e96cafcec13 |