Merge remote-tracking branch 'origin/master'

2012-12-22 19:08:35 +01:00
parent dc11a850dc fbcd47cb37
commit ff0963a4d8
9 changed files with 36 additions and 21 deletions
@@ -578,6 +578,7 @@ mac {
 		-lssl \
 		-lsqlite3 \
 		-ltinyxml \
+		-lprotobuf \
 		-lz \
 		-framework \
 		Carbon