diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/xcmiscproto | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/xcmiscproto')
| -rw-r--r-- | package/xcmiscproto/Makefile | 2 | ||||
| -rw-r--r-- | package/xcmiscproto/ipkg/xcmiscproto.control | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/package/xcmiscproto/Makefile b/package/xcmiscproto/Makefile index d128905d0..c31f476e8 100644 --- a/package/xcmiscproto/Makefile +++ b/package/xcmiscproto/Makefile @@ -9,7 +9,7 @@ PKG_NAME:= xcmiscproto PKG_VERSION:= 1.1.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 3c380a728697ded97a39addfe1acf2cb -MASTER_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/xcmiscproto/ipkg/xcmiscproto.control b/package/xcmiscproto/ipkg/xcmiscproto.control deleted file mode 100644 index 3b797121a..000000000 --- a/package/xcmiscproto/ipkg/xcmiscproto.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: xcmiscproto -Priority: optional -Section: x11 -Description: Xproto headers |