Merge branch 'next' into kilrah/FAS_Offset_compensation

Conflicts:
	companion/src/modeledit.ui
	radio/src/translations/cz.h
	radio/src/translations/de.h
	radio/src/translations/fr.h
	radio/src/translations/it.h
	radio/src/translations/pl.h
	radio/src/translations/pt.h
	radio/src/translations/se.h
This commit is contained in:
Andre Bernet
2014-01-15 16:02:32 +01:00
149 changed files with 39076 additions and 41823 deletions
+1 -6
View File
@@ -1307,12 +1307,7 @@ clean_list :
$(REMOVE) $(TARGET).lss
$(REMOVE) $(TARGET).lst
$(REMOVE) $(SRC:.c=.s)
$(REMOVE) *.o
$(REMOVE) */*.o
$(REMOVE) */*/*.o
$(REMOVE) */*/*/*.o
$(REMOVE) */*/*/*/*.o
$(REMOVE) */*/*/*/*/*.o
$(REMOVE) `find . -name "*.o"`
$(REMOVE) *.d
$(REMOVE) *.lst
$(REMOVE) allsrc.cpp