Commit Graph

69 Commits

Author SHA1 Message Date
Daniel Willmann 60560d74b8 Merge commit '315f10aa4759abb627f39122503874e7006db8b1' into dora 2017-06-02 15:01:44 +02:00
Neels Hofmeyr a526dd123e Merge commit '29dd84c82a756afcc44209f89fd2fd0d77307d73' into dora 2016-12-06 15:35:22 +01:00
Holger Hans Peter Freyther ba68c05621 Merge commit 'f3ffbf4db3a4a6a8c375e44c8d03f63bd4851afb' into dora 2016-03-23 12:00:39 +01:00
Holger Hans Peter Freyther 87183b8b71 Merge commit '04093241861f665ca3a7e47c5706be16269a4b9b' into dora 2015-11-27 11:03:19 +01:00
Holger Hans Peter Freyther de1460dab6 Merge commit '10e1b544716747d178e6efa9e798f4141a179f9d' into dora 2015-08-12 07:54:15 +02:00
Harald Welte 3da09cecaa Merge commit '78b77de220befe6a532e8afd83780aeef55974fe' into dora
this updates gpsdate for the gps-watchdog sub-package
2015-08-05 11:20:55 +02:00
Harald Welte f3e12f1297 Merge commit '5c86ed95c907f9e518a8fa3b3f6d58a8fe0a4f56' into dora 2015-07-06 14:03:33 +02:00
Holger Hans Peter Freyther c09363a966 Merge commit '29faf705ed31e2bf30be8cc0064f26be1851fcc3' into dora 2015-06-23 16:36:22 +02:00
Harald Welte 0d60036748 Merge commit 'c9908cfd53dd4d2e71d528ba9e019325e7409d70' into dora 2015-05-21 17:52:32 +02:00
Holger Hans Peter Freyther 27897f433a Merge commit 'b792b649e4cd2b7376af52642610b6bb5f489d5f' into dora 2015-05-21 19:38:28 +08:00
Holger Hans Peter Freyther be3c19b19b Merge commit '7f9ef4ddb9a0fd454e3fff9a58bbd8fa44cb6cef' into dora 2015-05-21 18:37:50 +08:00
Holger Hans Peter Freyther 20e4089ce3 Merge commit '8161ee10f0bf148d4dff4f584d3a6c02737d0f73' into dora 2015-05-21 18:30:06 +08:00
Holger Hans Peter Freyther 263ac6b27f Merge commit 'bbfff1e487037b2a60588d30e2a3851cf2c4be49' into dora 2015-05-21 18:17:59 +08:00
Harald Welte 5a597a3c91 Merge commit 'd3ae677639d84714602fd02e6803a7e6c5c45ecc' into dora 2015-05-20 11:01:53 +02:00
Holger Hans Peter Freyther ad81ff7de9 Merge commit 'bf472b1799a81f46ef0598efd31e64618b8f0730' into dora 2015-05-13 09:33:27 +02:00
Harald Welte bd6709ae21 Merge commit '809e9cd999f670950d250b1097a423a4f08fd8a4' into dora 2015-05-03 11:38:12 +02:00
Harald Welte 973134df36 Merge commit '3324575ef58f53ac38c59415de16a510c874200c' into dora 2015-05-02 19:23:06 +02:00
Harald Welte 58a8325efa Merge commit '6938804c99f4e86d917bc504701219ad978f611e' into dora 2015-05-02 17:34:47 +02:00
Harald Welte 0ac57c632d Merge commit '98a3705d93d238a66110adc9082f32685ae19f05' into dora 2015-05-02 12:02:37 +02:00
Harald Welte c1651f735b Merge commit 'b3923ebb690cad9ad0ca8d0c7a021cf82ea5ae59' into dora 2015-05-02 09:30:28 +02:00
Harald Welte 2a74413574 Merge commit 'ef40d4a5fd63b1477c184d2e4c50e6d7a124fd59' into dora 2015-05-02 09:21:19 +02:00
Harald Welte 9604d878c8 Merge commit '9c3c430ea2350ee45bf05c82b8d1333f3bf71370' into dora 2015-05-02 09:15:56 +02:00
Harald Welte f5860b5721 Merge commit 'fb51ce8a2e804cc0a5fd0975a00c3be44cda8767' into dora 2015-05-02 09:11:13 +02:00
Harald Welte 416847b66d Merge commit '66b18ff049314e3ad2c9ddd92b64ae319470ed7f' into dora 2015-05-01 23:30:14 +02:00
Harald Welte e31d5e8e13 Merge commit '4c6162968fc7b298bff6c06861bb287d35d0863f' into dora 2015-05-01 20:00:09 +02:00
Harald Welte 65bed443a2 Merge commit 'a3b942cdd9cb675589ac424130003b892208f371' into dora 2015-05-01 19:47:16 +02:00
Harald Welte 2d72c18711 Merge commit 'c2ef6813b8ffe7c60bb04404474a31bd83bea034' into dora 2015-05-01 19:38:39 +02:00
Harald Welte bcbe10686b Merge commit '8c70168d4001d029a60ab155042785ff831f3f9b' into dora 2015-05-01 17:51:49 +02:00
Holger Hans Peter Freyther d98550a233 Merge commit 'e0bcee0206fd3052fd2cf45c587957e6143fd1c7' into dora
With interfaces change from harald and the init script revert
2015-04-20 09:56:59 -04:00
Holger Hans Peter Freyther aa5270f6b1 Merge commit '259e1fa468e8af48c6e3382fe5de025d10bb8fbc' into dora 2015-04-15 18:39:45 -04:00
Holger Hans Peter Freyther 16ebad57f0 Merge commit '15dc869cdacf69bb3728ff0d47f7ff1ffbe18fca' into dora 2015-04-13 18:10:16 +02:00
Holger Hans Peter Freyther 3207d4b477 Merge commit '1ef790672e6bdb4ae7e281dcb71edb674c931474' into dora 2015-04-13 17:51:42 +02:00
Holger Hans Peter Freyther 305ee03b28 Merge commit 'e0c7f3c62132ff7b1a9c7d2c01ef2be60c6c0ddc' into dora 2015-04-13 17:43:07 +02:00
Holger Hans Peter Freyther 1620d1e81d Merge commit 'ba8eee83bd2ac4d13a00b20d92ed2c19a20052bc' into dora 2015-04-13 17:14:32 +02:00
Holger Hans Peter Freyther e855697bcb Merge commit 'ad976e4eb3c8c531d6fe808b5d68c48e05a81877' into dora 2015-04-13 16:57:16 +02:00
Holger Hans Peter Freyther d25cb4280e Merge commit '67d4fc8d404982d5ca95a68f98005e0c2b486f28' into dora 2015-02-22 14:31:44 +01:00
Holger Hans Peter Freyther 59806e79f4 Merge commit '06fe8c4e401b9b8da6fd5b575899277dd37a5f0d' into dora 2015-02-22 14:26:52 +01:00
Harald Welte 4998486b95 Merge commit '38d1587db55d0bad2a6cf32a7939998738a899a2' into dora 2015-02-20 11:33:48 +01:00
Holger Hans Peter Freyther 8fb884727e Merge commit 'ba75c10df7fa49e8acae27df8ee7cdaf761f725a' into dora 2015-02-15 00:42:02 +01:00
Holger Hans Peter Freyther 9d376794fc Merge commit '674b7ea9894888bc2008d732135b73a22568ea89' into dora 2015-02-14 20:38:00 +01:00
Holger Hans Peter Freyther 8d0dfc7b72 Merge commit '8c0c8b1229c2736c57e3cbe864035ae19629e940' into dora 2015-02-14 16:33:40 +01:00
Holger Hans Peter Freyther 8726e552f9 Merge commit '7b3ce0e6f739d31e42f8207f45b487d40401dc84' into dora 2015-02-14 16:05:56 +01:00
Holger Hans Peter Freyther 5d1e296ec5 Merge commit '2d93f2256ad9ed45c61505c208451f9fa00245f7' into dora 2015-02-14 14:44:35 +01:00
Holger Hans Peter Freyther c2ee669136 Merge commit 'adbc448df6520702b697938417b53e157e26a927' into dora 2015-02-14 13:37:01 +01:00
Harald Welte fbe38a755c Merge commit '9fd3aad4c9da930d3b611b400841c365fbd8ede3' into dora 2015-02-13 19:31:12 +01:00
Holger Hans Peter Freyther 0f2f51f20c Merge commit '3f2d2d338122e71b6a22f58f43e57ac8dfb3fcc1' into dora 2015-02-13 19:17:41 +01:00
Holger Hans Peter Freyther 2a79140b6d Merge commit 'ddd36a90fca6ccd48e9981308e71e99aa976ce91' into dora 2015-02-13 18:24:18 +01:00
Holger Hans Peter Freyther c1920defe6 Merge commit '5457cb39b4f48da02abb8b938a759d4fbf130381' into dora 2015-02-13 16:46:35 +01:00
Harald Welte d771e900da Merge commit '7d5329ed5713077c7a7c8cc0fefd099e553b00a0' into dora 2015-02-13 15:18:39 +01:00
Holger Hans Peter Freyther ae627ba075 Merge commit '61c2d2b6d3da16a4796a7de7633aaa08715eed25' into dora 2015-02-13 15:01:14 +01:00