Merge branch 'upstream'
authorStefan Westerfeld <stefan@space.twc.de>
Tue, 10 May 2011 13:55:59 +0000 (15:55 +0200)
committerStefan Westerfeld <stefan@space.twc.de>
Tue, 10 May 2011 13:55:59 +0000 (15:55 +0200)
1  2 
beast-gtk/bstutils.c
birnet/birnetutils.cc
bse/bseserver.c
bse/gslcommon.c
configure.in
po/POTSCAN

Simple merge
Simple merge
diff --cc bse/bseserver.c
Simple merge
diff --cc bse/gslcommon.c
Simple merge
diff --cc configure.in
Simple merge
diff --cc po/POTSCAN
Simple merge