filetransfer: merge from trunk, resolve conflict
[buildbot.git] / buildbot / 
tree1be8858a6d0cef6ca7d104622771a40be8eda466
drwxr-xr-x   ..
-rw-r--r-- 39 __init__.py
-rw-r--r-- 783 buildbot.png
-rw-r--r-- 2994 buildset.py
drwxr-xr-x - changes
drwxr-xr-x - clients
-rw-r--r-- 3466 dnotify.py
-rw-r--r-- 40564 interfaces.py
-rw-r--r-- 5634 locks.py
-rw-r--r-- 9946 manhole.py
-rw-r--r-- 40524 master.py
-rw-r--r-- 5450 pbutil.py
drwxr-xr-x - process
-rw-r--r-- 25906 scheduler.py
drwxr-xr-x - scripts
drwxr-xr-x - slave
-rw-r--r-- 3336 sourcestamp.py
drwxr-xr-x - status
drwxr-xr-x - steps
drwxr-xr-x - test
-rw-r--r-- 10085 twcompat.py
-rw-r--r-- 2017 util.py