diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /libs/pbd/wscript | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'libs/pbd/wscript')
| -rw-r--r-- | libs/pbd/wscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/pbd/wscript b/libs/pbd/wscript index 6907dd7693..59f7a3368b 100644 --- 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', |