merge max changes to master

This commit is contained in:
Max 2014-01-22 12:17:38 -05:00
parent 2abf7e27e4
commit 303a27bb16
3 changed files with 0 additions and 51 deletions

View File

@ -1 +0,0 @@
# git test file

View File

@ -1,25 +0,0 @@
#
# This file is part of PyBOMBS
#
# PyBOMBS is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
# PyBOMBS is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with PyBOMBS; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
#
category: common
depends: gnuradio boost libpcap gr-osmosdr libitpp
source: git://git://op25.osmocom.org/op25.git
#gitbranch: master
gitbranch: max-pybombs
inherit: cmake

View File

@ -1,25 +0,0 @@
#
# This file is part of PyBOMBS
#
# PyBOMBS is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
# PyBOMBS is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with PyBOMBS; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
#
category: baseline
satisfy_deb: libitpp-dev
# proper rpm name unknown - this is a guess
satisfy_rpm: libitpp-devel
source: wget://http://downloads.sourceforge.net/project/itpp/itpp/4.3.1/itpp-4.3.1.tar.bz2
inherit: autoconf