Berack/upo-senior-assistant-pi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Dawit Gulino 20013954
2018-05-31 16:13:18 +02:00
parent 20bee22c1a
commit 749e9ed078
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.idea/workspace.xml generated
View File

@@ -2,17 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="bf16df42-e8f6-4a52-a6da-5bff747a1a87" name="Default" comment=""> <list default="true" id="bf16df42-e8f6-4a52-a6da-5bff747a1a87" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_main.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_test.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/SeniorAssistant.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/device/Hue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/device/Hue.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/TestLights.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/TestLights.java" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.gradle/" /> <ignored path="$PROJECT_DIR$/.gradle/" />
<ignored path="$PROJECT_DIR$/build/" /> <ignored path="$PROJECT_DIR$/build/" />
@@ -453,10 +443,9 @@
<packageJsonPaths /> <packageJsonPaths />
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="10" /> <option name="x" value="-9" />
<option name="y" value="20" /> <option name="width" value="980" />
<option name="width" value="1346" /> <option name="height" value="1040" />
<option name="height" value="688" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
@@ -630,6 +619,14 @@
<updated>1527578891261</updated> <updated>1527578891261</updated>
<workItem from="1527578893151" duration="3638000" /> <workItem from="1527578893151" duration="3638000" />
</task> </task>
<task id="LOCAL-00001" summary="non so">
<created>1527775201021</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1527775201021</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
@@ -665,11 +662,10 @@
</history-entry> </history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="7123000" /> <option name="totallyTimeSpent" value="7867000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info anchor="right" id="Palette" /> <window_info anchor="right" id="Palette" />
<window_info anchor="right" id="sbt" /> <window_info anchor="right" id="sbt" />
@@ -736,7 +732,8 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="LAST_COMMIT_MESSAGE" value="" /> <MESSAGE value="non so" />
<option name="LAST_COMMIT_MESSAGE" value="non so" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/build.gradle"> <entry file="file://$PROJECT_DIR$/build.gradle">