Merge branch 'master' into procmule

2011-07-10 20:11:35 +03:00
parent 0b7693d077 e06f036c72
commit 6e15e3a8e1
23 changed files with 284 additions and 110 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -60,6 +60,7 @@ cc10:
 line33:
 	@$(PMCCABE) -c `find -name '*.c' -o -name '*.cc'`	\
 	 | grep -v mu-str-normalize.c				\
+	 | grep -v config_options_group_find			\
 	 | grep -v tests					\
         | awk '($$5 > 33)'