From c00d016e200164a35543fc559a10f0f4d958d942 Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Tue, 4 Jul 2017 14:49:36 +0200
Subject: [PATCH] join openbsc/.gitignore with .gitignore

Change-Id: Ib2120592749e85a4d13f6668e198857e3bddcf1e
---
 .gitignore         | 103 +++++++++++++++++++++++++++++++++++++++++++++
 openbsc/.gitignore | 103 ---------------------------------------------
 2 files changed, 103 insertions(+), 103 deletions(-)
 delete mode 100644 openbsc/.gitignore

diff --git a/.gitignore b/.gitignore
index 89bf7dfec..8e2c41b94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,104 @@
 debian/*.log
+*.o
+*.lo
+*.a
+.deps
+Makefile
+Makefile.in
+bscconfig.h
+bscconfig.h.in
+openbsc.pc
+src/osmo-nitb/osmo-nitb
+src/osmo-bsc_mgcp/osmo-bsc_mgcp
+src/osmo-bsc/osmo-bsc
+src/utils/meas_vis
+src/utils/meas_json
+src/utils/osmo-meas-pcap2db
+src/utils/osmo-meas-udp2db
+src/utils/smpp_mirror
+*.*~
+*.sw?
+.libs
+*.pyc
+*.gcda
+*.gcno
+
+#configure
+aclocal.m4
+autom4te.cache/
+config.log
+config.status
+config.guess
+config.sub
+configure
+compile
+depcomp
+install-sh
+missing
+stamp-h1
+libtool
+ltmain.sh
+
+# git-version-gen magic
+.tarball-version
+.version
+
+
+# apps and app data
+hlr.sqlite3
+src/utils/bs11_config
+src/ipaccess/ipaccess-config
+src/ipaccess/abisip-find
+src/ipaccess/ipaccess-firmware
+src/ipaccess/ipaccess-proxy
+src/utils/isdnsync
+src/nat/bsc_nat
+src/gprs/osmo-sgsn
+src/gprs/osmo-gbproxy
+src/gprs/osmo-gtphub
+src/osmo-bsc_nat/osmo-bsc_nat
+src/libcommon/gsup_test_client
+
+#tests
+tests/testsuite.dir
+tests/bsc-nat/bsc_nat_test
+tests/bsc-nat-trie/bsc_nat_trie_test
+tests/channel/channel_test
+tests/db/db_test
+tests/debug/debug_test
+tests/gsm0408/gsm0408_test
+tests/mgcp/mgcp_test
+tests/sccp/sccp_test
+tests/sms/sms_test
+tests/timer/timer_test
+tests/gprs/gprs_test
+tests/gbproxy/gbproxy_test
+tests/abis/abis_test
+tests/si/si_test
+tests/smpp/smpp_test
+tests/bsc/bsc_test
+tests/trau/trau_test
+tests/mgcp/mgcp_transcoding_test
+tests/sgsn/sgsn_test
+tests/subscr/subscr_test
+tests/subscr/bsc_subscr_test
+tests/oap/oap_test
+tests/gtphub/gtphub_test
+tests/mm_auth/mm_auth_test
+tests/xid/xid_test
+tests/sndcp_xid/sndcp_xid_test
+tests/slhc/slhc_test
+tests/v42bis/v42bis_test
+tests/nanobts_omlattr/nanobts_omlattr_test
+tests/oap/oap_client_test
+
+tests/atconfig
+tests/atlocal
+tests/package.m4
+tests/testsuite
+tests/testsuite.log
+
+gsn_restart
+src/openbsc.cfg*
+writtenconfig/
+gtphub_restart_count
diff --git a/openbsc/.gitignore b/openbsc/.gitignore
deleted file mode 100644
index 3dabea929..000000000
--- a/openbsc/.gitignore
+++ /dev/null
@@ -1,103 +0,0 @@
-*.o
-*.lo
-*.a
-.deps
-Makefile
-Makefile.in
-bscconfig.h
-bscconfig.h.in
-openbsc.pc
-src/osmo-nitb/osmo-nitb
-src/osmo-bsc_mgcp/osmo-bsc_mgcp
-src/osmo-bsc/osmo-bsc
-src/utils/meas_vis
-src/utils/meas_json
-src/utils/osmo-meas-pcap2db
-src/utils/osmo-meas-udp2db
-src/utils/smpp_mirror
-*.*~
-*.sw?
-.libs
-*.pyc
-*.gcda
-*.gcno
-
-#configure
-aclocal.m4
-autom4te.cache/
-config.log
-config.status
-config.guess
-config.sub
-configure
-compile
-depcomp
-install-sh
-missing
-stamp-h1
-libtool
-ltmain.sh
-
-# git-version-gen magic
-.tarball-version
-.version
-
-
-# apps and app data
-hlr.sqlite3
-src/utils/bs11_config
-src/ipaccess/ipaccess-config
-src/ipaccess/abisip-find
-src/ipaccess/ipaccess-firmware
-src/ipaccess/ipaccess-proxy
-src/utils/isdnsync
-src/nat/bsc_nat
-src/gprs/osmo-sgsn
-src/gprs/osmo-gbproxy
-src/gprs/osmo-gtphub
-src/osmo-bsc_nat/osmo-bsc_nat
-src/libcommon/gsup_test_client
-
-#tests
-tests/testsuite.dir
-tests/bsc-nat/bsc_nat_test
-tests/bsc-nat-trie/bsc_nat_trie_test
-tests/channel/channel_test
-tests/db/db_test
-tests/debug/debug_test
-tests/gsm0408/gsm0408_test
-tests/mgcp/mgcp_test
-tests/sccp/sccp_test
-tests/sms/sms_test
-tests/timer/timer_test
-tests/gprs/gprs_test
-tests/gbproxy/gbproxy_test
-tests/abis/abis_test
-tests/si/si_test
-tests/smpp/smpp_test
-tests/bsc/bsc_test
-tests/trau/trau_test
-tests/mgcp/mgcp_transcoding_test
-tests/sgsn/sgsn_test
-tests/subscr/subscr_test
-tests/subscr/bsc_subscr_test
-tests/oap/oap_test
-tests/gtphub/gtphub_test
-tests/mm_auth/mm_auth_test
-tests/xid/xid_test
-tests/sndcp_xid/sndcp_xid_test
-tests/slhc/slhc_test
-tests/v42bis/v42bis_test
-tests/nanobts_omlattr/nanobts_omlattr_test
-tests/oap/oap_client_test
-
-tests/atconfig
-tests/atlocal
-tests/package.m4
-tests/testsuite
-tests/testsuite.log
-
-gsn_restart
-src/openbsc.cfg*
-writtenconfig/
-gtphub_restart_count