projects / moonshot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ec6818f)
Update ui to fix merge conflict
authorSam Hartman <hartmans@debian.org>
Mon, 23 Jun 2014 16:08:58 +0000 (12:08 -0400)
committerSam Hartman <hartmans@debian.org>
Mon, 23 Jun 2014 16:10:03 +0000 (12:10 -0400)
ui patch | blob | history

diff --git a/ui b/ui
index ea9e814..8615288 160000 (submodule)
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit ea9e814dc5d1c142d006f60c575a0261f247e2b8
+Subproject commit 8615288ad1f321195dbc3e063bfb6f295fa28cd2
Core Moonshot code including mech_eap