Commit Graph

125 Commits

Author SHA1 Message Date
xdrm-brackets fdff3b6b5c Merge branch '1.0-local' into 1.0 2017-02-23 17:10:00 +01:00
xdrm-brackets 44b7f814f9 [fix] 2017-02-23 17:10:00 +01:00
xdrm-brackets a12f66fdb4 Merge branch '1.0-local' into 1.0 2017-02-23 17:09:06 +01:00
xdrm-brackets 41c2156b44 [fix] 2017-02-23 17:09:06 +01:00
xdrm-brackets 8d781ed054 Merge branch '1.0-local' into 1.0 2017-02-23 17:07:45 +01:00
xdrm-brackets 3154bc4147 [fix] 2017-02-23 17:07:45 +01:00
xdrm-brackets d96b3eae88 Merge branch '1.0-local' into 1.0 2017-02-23 17:04:47 +01:00
xdrm-brackets 08d18b187a [fix] 2017-02-23 17:04:47 +01:00
xdrm-brackets ca869eec8f Merge branch '1.0-local' into 1.0 2017-02-23 17:00:04 +01:00
xdrm-brackets 7168ae50ef [fix] 2017-02-23 17:00:04 +01:00
xdrm-brackets 7f2ca0f9f1 Merge branch '1.0-local' into 1.0 2017-02-23 16:58:33 +01:00
xdrm-brackets 44821dc5be debug 2017-02-23 16:58:29 +01:00
xdrm-brackets d9be4061aa Merge branch '1.0-local' into 1.0 2017-02-23 16:53:46 +01:00
xdrm-brackets 62fb097a9b [fix] free state file 2017-02-23 16:53:28 +01:00
xdrm-brackets 7722db1054 Merge branch '1.0-local' into 1.0 2017-02-23 16:49:54 +01:00
xdrm-brackets 88d1b4bbb5 [fix] 2017-02-23 16:49:50 +01:00
xdrm-brackets 547c55c4da Merge branch '1.0-local' into 1.0 2017-02-23 16:47:00 +01:00
xdrm-brackets 3f2ec43c7e [fix] 2017-02-23 16:46:54 +01:00
xdrm-brackets d4a38cb5e9 Merge branch '1.0-local' into 1.0 2017-02-23 16:44:32 +01:00
xdrm-brackets ea43b1c9de [fix] 2017-02-23 16:44:27 +01:00
xdrm-brackets 74cedbd331 Merge branch '1.0-local' into 1.0 2017-02-23 16:40:47 +01:00
xdrm-brackets f28cff5387 [fix] 2017-02-23 16:40:41 +01:00
xdrm-brackets 5653826429 Merge branch '1.0-local' into 1.0 2017-02-23 16:37:08 +01:00
xdrm-brackets fc81076621 debug 2017-02-23 16:37:03 +01:00
xdrm-brackets ca4df4c81b Merge branch '1.0-local' into 1.0 2017-02-23 16:35:22 +01:00
xdrm-brackets ae8acb461b [fix] min 2017-02-23 16:35:03 +01:00
xdrm-brackets 22b08ad2cc Merge branch '1.0-local' into 1.0 2017-02-23 16:33:38 +01:00
xdrm-brackets 8a157b252c [fix] 2017-02-23 16:33:35 +01:00
xdrm-brackets 23f39fe25f Merge branch '1.0-local' into 1.0 2017-02-23 16:31:58 +01:00
xdrm-brackets ae088ad453 [fix] added global state fetch 2017-02-23 16:31:54 +01:00
xdrm-brackets d68c01852f Merge branch '1.0-local' into 1.0 2017-02-23 16:30:49 +01:00
xdrm-brackets 99ee28d51b [fix] var name #2 2017-02-23 16:30:34 +01:00
xdrm-brackets eb13844a81 Merge branch '1.0-local' into 1.0 2017-02-23 16:28:49 +01:00
xdrm-brackets f6459afcd9 [fix] var name 2017-02-23 16:28:32 +01:00
xdrm-brackets 77b7e387e4 Merge branch '1.0-local' into 1.0 2017-02-23 16:27:10 +01:00
xdrm-brackets f8a06c40bb Merge branch '1.0-local' of https://git.xdrm.io/xdrm-brackets/logauth-sats into 1.0-local 2017-02-23 16:26:25 +01:00
xdrm-brackets 7e70ee4ec8 [fix] 2017-02-23 16:25:36 +01:00
xdrm-brackets 658c7080ed Merge branch '1.0-local' into 1.0 2017-02-23 16:12:10 +01:00
xdrm-brackets 78bd8a16fe [Fixed] global state update each time 2017-02-23 16:11:52 +01:00
xdrm-brackets 87aa64a732 Merge branch '1.0-local' into 1.0 2017-02-23 15:35:28 +01:00
xdrm-brackets 9f7da3f040 [Fix] while loops negate condition 2017-02-23 15:35:13 +01:00
xdrm-brackets 43902f8930 fixed dirs 2017-02-23 15:27:09 +01:00
xdrm-brackets 3d0002a1a0 Update local 2017-02-23 15:26:13 +01:00
xdrm-brackets 40a8e895c4 Merge branch '1.0' into 1.0-local 2017-02-23 15:24:09 +01:00
xdrm-brackets a689696a2b [Update] Used relation between 'global state' <=> 'chip state' to manage chips 2017-02-23 15:24:05 +01:00
xdrm-brackets 78fe237d8a [Fixed] Removed use of STATES_CONF : relation between GLOBAL_STATE <=> CHIP_STATE 2017-02-23 15:12:01 +01:00
xdrm-brackets e044ad028b Merge branch '1.0-local' into 1.0 2017-02-23 14:57:54 +01:00
xdrm-brackets 88cd366077 [Fix] min 2017-02-23 14:57:50 +01:00
xdrm-brackets 657be920e0 Merge branch '1.0-local' into 1.0 2017-02-23 14:56:16 +01:00
xdrm-brackets 02404a3b16 [Fix] min 2017-02-23 14:56:11 +01:00