Merge branch 'linphone', remote branch 'bc/master' into linphone

Conflicts:
	submodules/build/builder-iphone-os.mk
This commit is contained in:
Jehan Monnier 2011-03-16 13:23:41 +01:00
commit cc67c802d5

View file

@ -220,7 +220,7 @@ build-msilbc: build-libilbc $(MSILBC_BUILD_DIR)/Makefile
cd $(MSILBC_BUILD_DIR) && make && make install
clean-msilbc:
cd $(MSILBC_BUILD_DIR) && make clean
cd $(MSILBC_BUILD_DIR) && make -f clean
veryclean-msilbc:
cd $(MSILBC_BUILD_DIR) && make distclean