[projects/pld-builder.new/new-builddir: 3/3] Merge branch 'master' into new-builddir
glen
glen at pld-linux.org
Sat Oct 27 16:36:21 CEST 2012
commit 8ee019da71122c8be98a15c33f76cf36817f7fdc
Merge: 0cfedb4 0b2bbad
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Oct 27 17:36:11 2012 +0300
Merge branch 'master' into new-builddir
Conflicts:
PLD_Builder/request.py
PLD_Builder/report.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/8ee019da71122c8be98a15c33f76cf36817f7fdc
More information about the pld-cvs-commit
mailing list