 Daniel Willmann
|
2e683aa937
|
Merge commit '503355bbf4fe630346103836dc733a70939930d3' into 3g
|
2017-05-31 17:54:06 +02: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
|
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 |