Merge branch 'development'

jsaletin · Jan 15, 2015 · 00aa628 · 00aa628
2 parents e5a3aaa + 3cd9661
commit 00aa628
Show file tree

Hide file tree

Showing 6 changed files with 1,221 additions and 1,163 deletions.
diff --git a/Hume-1.0a/parseTag.m → Hume-1.0a/coreFunctions/parseTag.m b/Hume-1.0a/parseTag.m → Hume-1.0a/coreFunctions/parseTag.m
diff --git a/Hume-1.0a/plotSleepData.m → Hume-1.0a/coreFunctions/plotSleepData.m b/Hume-1.0a/plotSleepData.m → Hume-1.0a/coreFunctions/plotSleepData.m
diff --git a/Hume-1.0a/gui/sleepScoring.fig b/Hume-1.0a/gui/sleepScoring.fig