projects / irspy-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 840818e 89c045e)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 14 Nov 2014 12:53:22 +0000 (13:53 +0100)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 14 Nov 2014 12:53:22 +0000 (13:53 +0100)
Conflicts:
zebra/zebra.cfg

1  2 
zebra/zebra.cfg patch | diff1 | diff2 | blob | history

diff --cc zebra/zebra.cfg
Simple merge
Registry of IR servers with automatic testing