git.graph-it.com / graphit / unipi-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04e9aea a9e956f)
Merge branch 'master' of http://86.49.170.141:3000/UniPi/neuron-kernel
authorTom Knot <tomasknot@gmail.com>
Thu, 14 Jun 2018 10:01:17 +0000 (12:01 +0200)
committerTom Knot <tomasknot@gmail.com>
Thu, 14 Jun 2018 10:01:17 +0000 (12:01 +0200)
# Conflicts:
# modules/unipi/src/unipi_uart.c
# version.txt

1  2 
version.txt patch | diff1 | | blob | history

diff --cc version.txt
index 9c22272fcbab09369b945bacdb082cb1c0a61814,0000000000000000000000000000000000000000..7e7795b20eb14329642c5bc47563ffed3229cbfd
mode 100644,000000..100644
--- 1/version.txt
--- /dev/null
+++ 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