Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 00:20:46 +0000 (01:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 00:20:46 +0000 (01:20 +0100)
commit1a4ffa5b136a112935e7db19eb49e6042c6d5143
treeebacb4ce290422cfe893bc96180d961fa7b7a43f
parent3220a894f794607efab96ec3837e4c64f19f75ea
parent8b63ebcb038683a6a772d0e9d9518b60bbd9a22f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Remove redundant OBJS declaration intended for programs

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Makefile