Permalink
Browse files

Merge branch 'master' into experimental

Conflicts:
	fwmod
	make/libs/yaml/yaml.mk
	make/socat/socat.mk
	toolchain/Config.in
	toolchain/make/target/gcc/4.8.0/000-no_target_flags_as_BUILD_FLAGS.freetz.patch
	toolchain/make/target/gcc/4.8.0/005-no_docs.patch
	toolchain/make/target/gcc/4.8.0/010-make-j-fixes.pr42980_backport.install-multi.patch
	toolchain/make/target/gcc/4.8.0/010-make-j-fixes.pr42980_backport.multido.patch
	toolchain/make/target/gcc/4.8.0/010-use_bundled_mkstemps.patch
	toolchain/make/target/gcc/4.8.0/020-no_python.patch
	toolchain/make/target/gcc/4.8.0/100-uclibc-conf.patch
	toolchain/make/target/gcc/4.8.0/101-libgcc-exclude-rarely-used-functions.patch
	toolchain/make/target/gcc/4.8.0/110-overridable-CXXFLAGS_FOR_TARGET.patch
	toolchain/make/target/gcc/4.8.0/301-missing-execinfo_h.patch
	toolchain/make/target/gcc/4.8.0/302-c99-snprintf.patch
	toolchain/make/target/gcc/4.8.0/305-libmudflap-susv3-legacy.patch
	toolchain/make/target/gcc/4.8.0/800-libgcc-disable-mips16-float.patch
	toolchain/make/target/gcc/4.8.0/800-libgcc-dwarf.patch
	toolchain/make/target/gcc/4.8.0/820-libgcc_pic.patch
	toolchain/make/target/gcc/4.8.0/910-mbsd_multi.patch
	toolchain/make/target/gcc/4.8.1/000-no_target_flags_as_BUILD_FLAGS.freetz.patch
	toolchain/make/target/gcc/4.8.1/005-no_docs.patch
	toolchain/make/target/gcc/4.8.1/010-make-j-fixes.pr42980_backport.install-multi.patch
	toolchain/make/target/gcc/4.8.1/010-make-j-fixes.pr42980_backport.multido.patch
	toolchain/make/target/gcc/4.8.1/010-use_bundled_mkstemps.patch
	toolchain/make/target/gcc/4.8.1/020-no_python.patch
	toolchain/make/target/gcc/4.8.1/100-uclibc-conf.patch
	toolchain/make/target/gcc/4.8.1/101-libgcc-exclude-rarely-used-functions.patch
	toolchain/make/target/gcc/4.8.1/110-overridable-CXXFLAGS_FOR_TARGET.patch
	toolchain/make/target/gcc/4.8.1/301-missing-execinfo_h.patch
	toolchain/make/target/gcc/4.8.1/302-c99-snprintf.patch
	toolchain/make/target/gcc/4.8.1/305-libmudflap-susv3-legacy.patch
	toolchain/make/target/gcc/4.8.1/800-libgcc-disable-mips16-float.patch
	toolchain/make/target/gcc/4.8.1/800-libgcc-dwarf.patch
	toolchain/make/target/gcc/4.8.1/820-libgcc_pic.patch
	toolchain/make/target/gcc/4.8.1/910-mbsd_multi.patch
	toolchain/make/target/gcc/gcc.mk
	toolchain/target/binutils/patches/2.23.2/010-use_bundled_mkstemps.patch
	toolchain/target/gcc/patches/4.7.3/101-libgcc-exclude-rarely-used-functions.patch
	toolchain/target/gcc/patches/4.8.0/000-no_target_flags_as_BUILD_FLAGS.freetz.patch
	toolchain/target/gcc/patches/4.8.0/005-no_docs.patch
	toolchain/target/gcc/patches/4.8.0/010-make-j-fixes.pr42980_backport.install-multi.patch
	toolchain/target/gcc/patches/4.8.0/010-make-j-fixes.pr42980_backport.multido.patch
	toolchain/target/gcc/patches/4.8.0/020-no_python.patch
	toolchain/target/gcc/patches/4.8.0/100-uclibc-conf.patch
	toolchain/target/gcc/patches/4.8.0/110-overridable-CXXFLAGS_FOR_TARGET.patch
	toolchain/target/gcc/patches/4.8.0/301-missing-execinfo_h.patch
	toolchain/target/gcc/patches/4.8.0/302-c99-snprintf.patch
	toolchain/target/gcc/patches/4.8.0/305-libmudflap-susv3-legacy.patch
	toolchain/target/gcc/patches/4.8.0/800-libgcc-disable-mips16-float.patch
	toolchain/target/gcc/patches/4.8.0/800-libgcc-dwarf.patch
	toolchain/target/gcc/patches/4.8.0/820-libgcc_pic.patch
	toolchain/target/gcc/patches/4.8.0/910-mbsd_multi.patch
  • Loading branch information...
2 parents 06dc259 + 67c1cfe commit ef422942cb085e3e5b5bf9ddef6de594b82ffcf0 @olistudent committed Jun 10, 2013
Showing 456 changed files with 4,953 additions and 1,283 deletions.
View
@@ -13,7 +13,14 @@ Latest changes:
- New patches (read online help for more info):
- New packages, libs, modules:
+ * asterisk 11.4.0
* E-MailRelay 1.8.2
+ * libgsm-1.0.13
+ * libsrtp-1.4.4+20100615
+ * PJProject 2.1.0-git
+ * serf 1.2.0
+ * ScanButton 0.2.3.cvs20090713
+ * speex 1.2rc1
- Updated tools and hooks:
@@ -25,18 +32,24 @@ Latest changes:
* dnsmasq 2.66
* dropbear 2013.58
* ffmpeg 1.2.1
- * git 1.8.2.3
+ * git 1.8.3
* gmp 5.1.2
+ * inadyn-mt 02.24.38
* libconfig 1.4.9
* libxml 2.9.1
* minidlna 1.1.0
* nano 2.2.6
* ngircd 20.2
+ * openssh 6.2p2
+ * openvpn 2.3.2
+ * pcre 8.33
* php 5.3.25/5.4.15
* Python 2.7.5
* samba 3.6.14
+ * sqlite 3.7.17
+ * subversion 1.7.10
* tmux 1.8
- * umurmur 0.2.11
+ * umurmur 0.2.12
* zlib 1.2.8
- Remove packages, libs, modules, tools:
View
129 Config.in

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit ef42294

Please sign in to comment.