projects / saartuer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60b53b7 67cf854)
Merge branch 'master' of ralfj.de:saartuer
authorConstantin Berhard <constantin@exxxtremesys.lu>
Thu, 10 Oct 2013 14:54:04 +0000 (16:54 +0200)
committerConstantin Berhard <constantin@exxxtremesys.lu>
Thu, 10 Oct 2013 14:54:04 +0000 (16:54 +0200)
1  2 
statemachine.py patch | diff1 | diff2 | blob | history

diff --cc statemachine.py
Simple merge
Stuff to open our door, archived