Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v047-0314.57.a #21

Merged
merged 25 commits into from
Mar 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
911fba9
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
fiveseven808 Mar 11, 2017
dd1991a
"v046-0311.57.a"
fiveseven808 Mar 11, 2017
6c7072c
change repo cloning level
fiveseven808 Mar 11, 2017
a9b310e
not sure about these changes... LOLn
fiveseven808 Mar 12, 2017
1179d4a
commiting changes before i can't anymore
fiveseven808 Mar 12, 2017
4fd7881
trying to fix...
fiveseven808 Mar 13, 2017
9a32995
"v047-0312.57.a"
fiveseven808 Mar 13, 2017
95e449e
visual changes
fiveseven808 Mar 13, 2017
e770c7f
choice is more obvious
fiveseven808 Mar 13, 2017
6d93c18
clearing things up again...
fiveseven808 Mar 13, 2017
2bcb6ad
broke, but i still need to sync...
fiveseven808 Mar 13, 2017
dfff60c
cleaned up repo
fiveseven808 Mar 13, 2017
8912cae
tentative fix
fiveseven808 Mar 13, 2017
d339c1b
more visuals
fiveseven808 Mar 13, 2017
23454e4
small changes
fiveseven808 Mar 13, 2017
d395fe7
added provisions for a changelog viewer...
fiveseven808 Mar 14, 2017
8f2b071
don't wanna break dev yet...
fiveseven808 Mar 14, 2017
0c91c3e
looks like it works. committing it now...
fiveseven808 Mar 14, 2017
b34bc08
v047-0313.57.a
fiveseven808 Mar 14, 2017
12f6087
Merge remote-tracking branch 'refs/remotes/origin/dev' into main_menu…
fiveseven808 Mar 14, 2017
5fbed7c
def single_value_menu
fiveseven808 Mar 15, 2017
9a1b1c4
Merge remote-tracking branch 'refs/remotes/origin/dev' into main_menu…
fiveseven808 Mar 15, 2017
f0294f8
Merge pull request #20 from fiveseven808/main_menu_port
fiveseven808 Mar 15, 2017
96d4a02
removing prototype
fiveseven808 Mar 15, 2017
42e1242
yay! 2017-03-14 //57
fiveseven808 Mar 15, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#stuffs folder with my psd and everything lol
stuffs/
#stuffs/

#for my HA suff
HA/
#HA/

# Experiment stuff
Experiment/
Trash/
Archive/
Example Scenes/
#Experiment/
#Trash/
#Archive/
#Example Scenes/


# Windows image file caches
Expand Down
12 changes: 0 additions & 12 deletions Archive/authtest.py

This file was deleted.

194 changes: 0 additions & 194 deletions Archive/oledmenuarduino.cpp

This file was deleted.

Loading