diff options
author | bionade24 | 2020-03-08 10:56:11 +0100 |
---|---|---|
committer | bionade24 | 2020-03-08 10:56:11 +0100 |
commit | 56326b3b552f59c680da6afffc56c58d33a2a8fd (patch) | |
tree | b9a575c62846ec05af74714ceb730825c5af8715 | |
parent | af7df7e566892db7945bc8e0c105411e412f3f61 (diff) | |
parent | 044f75183693fdfd5a0b12c4bcecec0ffbf39539 (diff) | |
download | aur-56326b3b552f59c680da6afffc56c58d33a2a8fd.tar.gz |
Merge divergent HEADs
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -42,6 +42,8 @@ pkgbase = ros-melodic-rviz makedepends = tinyxml2 makedepends = urdfdom-headers makedepends = qt5-base + makedepends = python2-pyqt5 + makedepends = python2-sip-pyqt5 depends = ros-melodic-std-srvs depends = ros-melodic-rosbag depends = ros-melodic-tf @@ -47,6 +47,8 @@ makedepends=( tinyxml2 urdfdom-headers qt5-base + python2-pyqt5 + python2-sip-pyqt5 ) ros_depends=( |