projects / skytools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d3c1f5 7d94133)
Merge remote branch 'martino/master'
authorMarko Kreen <markokr@gmail.com>
Wed, 7 Dec 2011 10:23:17 +0000 (12:23 +0200)
committerMarko Kreen <markokr@gmail.com>
Wed, 7 Dec 2011 10:23:17 +0000 (12:23 +0200)
1  2 
python/skytools/scripting.py patch | diff1 | diff2 | blob | history

diff --cc python/skytools/scripting.py
Simple merge
Skytools master repo.