Commit Graph

32 Commits

Author SHA1 Message Date
Daniel Willmann af8cb4980a Merge commit '3b2076a5563a27e114b02a1e41cf4f62330e9575' into dora 2017-06-02 15:01:41 +02:00
Harald Welte d35db6f1b5 Merge commit '24b544024cfcfe1b3e49b07992187cd826ba7028' into dora 2017-02-10 17:03:55 +01:00
Harald Welte 1ca4555bef Merge commit 'a7e967225d4b3b2bc518e14296e82be1f3b6c25b' into dora 2017-02-10 16:12:57 +01:00
Neels Hofmeyr f882d0a98b Merge commit '8cf5a67850adf270bc2fdb4c0ed708b0ba037670' into dora 2016-12-06 15:35:02 +01:00
Holger Hans Peter Freyther 207ab6359d Merge commit '9092529d52b16e271eb8f2e287d4ae6b19a04e7e' into dora 2016-03-23 12:00:36 +01:00
Harald Welte 4e69783333 Merge commit 'aa458a136ebd4abc55d502984b5c90ddab458288' into dora
This brings in libtalloc for the sdk
2016-02-23 13:39:43 +01:00
Holger Hans Peter Freyther 94a36866e7 Merge commit '87c73f768c84613f07e704026f3b6eff9459cfd0' into dora 2016-01-22 19:20:12 +01:00
Holger Hans Peter Freyther bd81eeb08c Merge commit 'a715416731955e0454fc88d439709c94afb4b1af' into dora 2015-12-26 19:03:22 +01:00
Harald Welte 2ffc4a04b0 Merge commit '97676796f729efd1c847ff65da9a5076ab0a8cbb' into dora 2015-07-06 14:03:30 +02:00
Holger Hans Peter Freyther 94adaf9c2d Merge commit '7b41ee80ec30db8d218ce900bf0df5d2333e42c1' into dora 2015-06-26 13:39:17 +02:00
Holger Hans Peter Freyther 1440b3f6ef Merge commit 'f44fee44be75a06deb85248b6e82c21a52bf34a7' into dora 2015-04-10 15:30:40 +02:00
Holger Hans Peter Freyther bec08f4417 Merge commit '80b3fe86f67516c6297a6c6a18db87a7b43e69f0' into dora 2015-02-12 14:29:56 +01:00
Holger Hans Peter Freyther 15dc569022 Merge commit 'c48a0a0a4d1811710259b66c86bc30fd29162083' into dora 2015-01-09 21:30:07 +01:00
Holger Hans Peter Freyther 0d8d969931 Merge commit 'cc7705489c8342c8c2c9f168fa404553ee1f9040' into dora 2015-01-06 19:32:37 +01:00
Holger Hans Peter Freyther cb72d7dfdc Merge commit '70922d86dec59a530fd3c7c5fe827d582b15a171' into dora 2014-12-30 12:21:16 +01:00
Holger Hans Peter Freyther 706374154e Merge commit '873ae51925a67a267f42301140387ce5b854f66f' into dora 2014-12-30 12:11:52 +01:00
Holger Hans Peter Freyther f93bec1bf8 Merge commit 'f244a25089098d0728bdf899f7109deaeac19853' into dora 2014-12-26 17:07:59 +01:00
Holger Hans Peter Freyther 122936e1be openbsc: Fix the non-confirming SDP file
There must be a session name inside the SDP file, build a newer
version of OpenBSC to fix that.
2014-11-20 23:26:53 +01:00
Holger Hans Peter Freyther 36db2bd7d4 Merge commit '60ade1ce5680486e33ee110786b60cbf83a311af' into dora 2014-11-19 16:25:32 +01:00
Holger Hans Peter Freyther c0a4618671 Merge commit 'bef17822a767b74449baf7cf69e7cb09e7f0ebd1' into dora 2014-11-18 09:42:54 +01:00
Holger Hans Peter Freyther 4760757960 Merge commit '07c37e9902a278779a0312b4ac2b2437424ec38d' into dora 2014-11-09 14:40:36 +01:00
Holger Hans Peter Freyther 3fec3c1c58 Merge commit 'e292b907610659f13261a7e4cf9f426128b364ce' into dora 2014-10-29 10:23:23 +01:00
Holger Hans Peter Freyther 4cb109a0d5 Merge commit 'b28405e6a0706fe560bb29efc2691df9e22d092b' into dora 2014-10-07 17:04:33 +02:00
Holger Hans Peter Freyther 0cca6ebca0 Merge commit '65238f85305f3179491e5e4be8152ea35454ac84' into dora 2014-10-07 17:01:37 +02:00
Holger Hans Peter Freyther e9781837fd Merge commit '84edb39d87f0b13ae27c92a3fe8635a3051d26a5' into dora 2014-09-24 17:29:02 +02:00
Holger Hans Peter Freyther 33f625756b Merge commit 'fa6475f559b2daacb68c2989aa94cbd55f39b349' into dora 2014-08-25 08:44:18 +02:00
Holger Hans Peter Freyther 4d46da53ac Merge commit 'd9a5b19a0a420270b31c5f90afc6ede38340ab29' into dora 2014-08-25 08:39:41 +02:00
Holger Hans Peter Freyther cf3256fd7c Merge commit '1e73b53323b919bcf171df4df573dcb3d6d546bb' into dora 2014-08-21 17:35:31 +02:00
Holger Hans Peter Freyther 29af1f4b9b Merge commit '1e059eb7d83878c78126be44a56d483c37eccb26' into dora 2014-08-21 13:29:51 +02:00
Holger Hans Peter Freyther 91638a2adc Add 'meta-telephony/' from commit '023ca5da04c53ef93ce7c933c2d362ad901ad45e'
git-subtree-dir: meta-telephony
git-subtree-mainline: 5720f60a7e
git-subtree-split: 023ca5da04
2014-07-30 17:25:32 +02:00
Holger Hans Peter Freyther 1994264eba misc: Remove layers merged with subtree merges
Subtree merges are horrible broken and subtree is now back and we can
start using it.
2014-07-30 17:22:38 +02:00
Holger Hans Peter Freyther 8ac87f34cf Merge remote-tracking branch 'meta-telephony/master' into dora 2014-03-28 11:42:01 +01:00