fix merge conflicts from master

2013-08-24 12:18:06 -04:00
parent 8cd71108c1 1421a34e52
commit ee1b49f87e
98 changed files with 20163 additions and 16410 deletions
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -58,6 +58,7 @@ libpbd_sources = [
    'openuri.cc',
    'pathexpand.cc',
    'pathscanner.cc',
+    'pbd.cc',
    'pool.cc',
    'property_list.cc',
    'pthread_utils.cc',