~olbohlen/oi-userland.git

OpenIndiana Userland

Merge pull request #1779 from pyhalov/upstream

Alexander Pyhalov

2016-03-22 feb40d3d9949f112b470a70b2cc2075466c5da05

refs
author	Alexander Pyhalov <apyhalov@gmail.com>
	Tuesday, March 22, 2016 08:36 +0100
committer	Alexander Pyhalov <apyhalov@gmail.com>
	Tuesday, March 22, 2016 08:36 +0100
commit	feb40d3d9949f112b470a70b2cc2075466c5da05
tree	6b3e4949d4df85d27b2bff62c25a4e303fef37f9 tree \| zip \| gz
parent	2704aad4c3b2596ab6bdad2a551f74c26b1feef2 view \| diff 4d911cc1fde320fe300fc8707542eb0fd7217a0b view \| diff

Merge pull request #1779 from pyhalov/upstream

1 files deleted

4 files added

24 files renamed

	components/desktop/pidgin-otr/Makefile	6 ●●●●● diff \| view \| raw \| blame \| history
	components/desktop/pidgin-otr/patches/automake-1.15.patch	diff \| view \| raw \| blame \| history
	components/desktop/pidgin-otr/patches/disable_stack_protector.patch	diff \| view \| raw \| blame \| history
	components/desktop/pidgin-otr/pidgin-otr.license	diff \| view \| raw \| blame \| history
	components/desktop/pidgin-otr/pidgin-otr.p5m	1 ●●●●● diff \| view \| raw \| blame \| history
	components/ejabberd/patches/ejabberd-install.patch	100 ●●●●● diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/Makefile	16 ●●●●● diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/exec_attr.dumpcap	diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/patches/Bug12236-1.patch	93 ●●●●● diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/patches/Bug12236-2.patch	103 ●●●●● diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/patches/DesktopEntry.patch	16 ●●●●● diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/patches/disable_lua_error_when_root.patch	diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/patches/evb.patch	55 ●●●●● diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/patches/man.patch	61 ●●●●● diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/resolve.deps	diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/tshark.p5m	diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/wireshark-common.p5m	103 ●●●●● diff \| view \| raw \| blame \| history
	components/sysutils/wireshark/wireshark.p5m	19 ●●●●● diff \| view \| raw \| blame \| history
	components/web/ejabberd/Makefile	35 ●●●●● diff \| view \| raw \| blame \| history
	components/web/ejabberd/auth_attr	diff \| view \| raw \| blame \| history
	components/web/ejabberd/ejabberd.p5m	91 ●●●●● diff \| view \| raw \| blame \| history
	components/web/ejabberd/ejabberdctl.1m	diff \| view \| raw \| blame \| history
	components/web/ejabberd/exec_attr	diff \| view \| raw \| blame \| history
	components/web/ejabberd/patches/000-erlan-update.patch	57 ●●●●● diff \| view \| raw \| blame \| history
	components/web/ejabberd/patches/001-no-sslv3.patch	23 ●●●●● diff \| view \| raw \| blame \| history
	components/web/ejabberd/prof_attr	diff \| view \| raw \| blame \| history
	components/web/ejabberd/resolve.deps	diff \| view \| raw \| blame \| history
	components/web/ejabberd/xmpp-ejabberd	diff \| view \| raw \| blame \| history
	components/web/ejabberd/xmpp-ejabberd.xml	diff \| view \| raw \| blame \| history