]> err.no Git - dak/commitdiff
projects / dak / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79435b6 06d8add)
Merge branch 'master' into dbtests
authorTorsten Werner <twerner@debian.org>
Mon, 21 Mar 2011 17:21:16 +0000 (18:21 +0100)
committerTorsten Werner <twerner@debian.org>
Mon, 21 Mar 2011 17:22:18 +0000 (18:22 +0100)
Conflicts:
dak/update_db.py

Signed-off-by: Torsten Werner <twerner@debian.org>
1  2 
daklib/dbconn.py patch | diff1 | diff2 | blob | history
daklib/queue.py patch | diff1 | diff2 | blob | history

diff --cc daklib/dbconn.py
Simple merge
diff --cc daklib/queue.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.