Merge /home/juan/projects/xbps-packages into gnome-3.4

Conflicts:
	common/shlibs
This commit is contained in:
Juan RP
2012-03-25 11:40:40 +02:00
6 changed files with 51 additions and 0 deletions

View File

@@ -952,3 +952,4 @@ libgcr-base-3.so.1 gcr gcr-devel
libwacom.so.2 libwacom libwacom-devel
libfarstream-0.1.so.0 farstream farstream-devel
libtelepathy-farstream.so.2 telepathy-farstream telepathy-farstream-devel
libass.so.4 libass libass-devel