From: Tom Knot <tomasknot@gmail.com>
Date: Thu, 14 Jun 2018 10:01:17 +0000 (+0200)
Subject: Merge branch 'master' of http://86.49.170.141:3000/UniPi/neuron-kernel
X-Git-Url: http://git.graph-it.com/?a=commitdiff_plain;h=2d137ed72626afa8a8c646dc137e736c5dd53bd4;p=graphit%2Funipi-kernel.git

Merge branch 'master' of 86.49.170.141:3000/UniPi/neuron-kernel

# Conflicts:
#	modules/unipi/src/unipi_uart.c
#	version.txt
---

2d137ed72626afa8a8c646dc137e736c5dd53bd4
diff --cc version.txt
index 9c22272,0000000..7e7795b
mode 100644,000000..100644
--- a/version.txt
+++ b/version.txt
@@@ -1,1 -1,0 +1,1 @@@
- Repository:neuron-kernel ActiveBranch:[master] PrecedingRelease:v.0.10 PrecedingRevision:42(f4c711b) LatestCommit:Thu Jun 14 12:00:04 CEST 2018
++Repository:neuron-kernel ActiveBranch:[master] PrecedingRelease:v.0.12 PrecedingRevision:42(dbc2229) LatestCommit:Thu Jun 14 12:01:18 CEST 2018