~olbohlen/oi-userland.git

Merge remote-tracking branch 'origin/upstream' into oi/hipster

Andrzej Szeszo

2013-06-04 453bf5a3004107204e1858532a38b3e703e32995

refs
author	Andrzej Szeszo <aszeszo@gmail.com>
	Tuesday, June 4, 2013 12:32 +0200
committer	Andrzej Szeszo <aszeszo@gmail.com>
	Tuesday, June 4, 2013 12:32 +0200
commit	453bf5a3004107204e1858532a38b3e703e32995
tree	e279a4c93fb760860bafa3ffeb9aa19bcd0789d3 tree \| zip \| gz
parent	761e6b34ead6509cee400de9a40be3687e712897 view \| diff 97df8161425e1542dc5c69a25124d4fc5a11bd3e view \| diff

Merge remote-tracking branch 'origin/upstream' into oi/hipster

Conflicts:
	components/aalib/aalib.p5m

3 files deleted

43 files added

58 files modified

3 files renamed

	.hgtags	2 ●●●●● diff \| view \| raw \| blame \| history
	components/aalib/aalib.license	26 ●●●●● diff \| view \| raw \| blame \| history
	components/aalib/aalib.p5m	32 ●●●●● diff \| view \| raw \| blame \| history
	components/antlr/Makefile	4 ●●●●● diff \| view \| raw \| blame \| history
	components/autogen/Makefile	23 ●●●●● diff \| view \| raw \| blame \| history
	components/autogen/autogen.license	850 ●●●●● diff \| view \| raw \| blame \| history
	components/autogen/autogen.p5m	75 ●●●●● diff \| view \| raw \| blame \| history
	components/autogen/patches/guile-iface.h.patch	35 ●●●●● diff \| view \| raw \| blame \| history
	components/curl/Makefile	1 ●●●●● diff \| view \| raw \| blame \| history
	components/doxygen/Makefile	12 ●●●●● diff \| view \| raw \| blame \| history
	components/doxygen/patches/doxygen1.patch	20 ●●●●● diff \| view \| raw \| blame \| history
	components/imagemagick/patches/16615558.patch	21 ●●●●● diff \| view \| raw \| blame \| history
	components/ircii/Makefile	14 ●●●●● diff \| view \| raw \| blame \| history
	components/ircii/ircii.p5m	7 ●●●●● diff \| view \| raw \| blame \| history
	components/ircii/patches/ircterm.h.patch	32 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/Makefile	64 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/libarchive.license	150 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/libarchive.p5m	70 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/archive_string.c.patch	17 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/archive_write_set_format_ar.c.patch	16 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/archive_write_set_format_pax.c.patch	27 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/archive_write_set_format_zip.c.patch	16 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_entry.3.patch	65 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_entry_acl.3.patch	35 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_entry_linkify.3.patch	34 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_entry_paths.3.patch	41 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_entry_perms.3.patch	46 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_entry_stat.3.patch	37 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_entry_time.3.patch	35 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_read.3.patch	101 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_read_disk.3.patch	93 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_read_set_options.3.patch	25 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_util.3.patch	56 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_write.3.patch	87 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_write_disk.3.patch	82 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-archive_write_set_options.3.patch	28 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-libarchive-formats.5.patch	86 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/patches/libarchive-libarchive.3.patch	100 ●●●●● diff \| view \| raw \| blame \| history
	components/libarchive/resolve.deps	6 ●●●●● diff \| view \| raw \| blame \| history
	components/librsync/Makefile	4 ●●●●● diff \| view \| raw \| blame \| history
	components/libsndfile/Makefile	4 ●●●●● diff \| view \| raw \| blame \| history
	components/logilab-astng/Makefile	8 ●●●●● diff \| view \| raw \| blame \| history
	components/logilab-common/Makefile	15 ●●●●● diff \| view \| raw \| blame \| history
	components/mc/Makefile	4 ●●●●● diff \| view \| raw \| blame \| history
	components/mc/mc.p5m	2 ●●●●● diff \| view \| raw \| blame \| history
	components/open-fabrics/libibmad/patches/base.patch	747 ●●●●● diff \| view \| raw \| blame \| history
	components/openssl/openssl-1.0.1/Makefile	3 ●●●●● diff \| view \| raw \| blame \| history
	components/openssl/openssl-1.0.1/mapfile.wanboot	3 ●●●●● diff \| view \| raw \| blame \| history
	components/openssl/openssl-1.0.1/patches/openssl-t4-inline.sparc-patch	72 ●●●●● diff \| view \| raw \| blame \| history
	components/pixz/Makefile	65 ●●●●● diff \| view \| raw \| blame \| history
	components/pixz/files/pixz.1	139 ●●●●● diff \| view \| raw \| blame \| history
	components/pixz/pixz.p5m	43 ●●●●● diff \| view \| raw \| blame \| history
	components/pixz/resolve.deps	3 ●●●●● diff \| view \| raw \| blame \| history
	components/pylint/Makefile	8 ●●●●● diff \| view \| raw \| blame \| history
	components/python/argparse/Makefile	52 ●●●●● diff \| view \| raw \| blame \| history
	components/python/argparse/argparse-26.p5m	52 ●●●●● diff \| view \| raw \| blame \| history
	components/python/argparse/argparse.license	279 ●●●●● diff \| view \| raw \| blame \| history
	components/python/argparse/argparse.p5m	40 ●●●●● diff \| view \| raw \| blame \| history
	components/python/argparse/resolve.deps	1 ●●●●● diff \| view \| raw \| blame \| history
	components/python/cherrypy/Makefile	6 ●●●●● diff \| view \| raw \| blame \| history
	components/python/cssutils/Makefile	10 ●●●●● diff \| view \| raw \| blame \| history
	components/python/decorator/Makefile	4 ●●●●● diff \| view \| raw \| blame \| history
	components/python/imaging/Makefile	11 ●●●●● diff \| view \| raw \| blame \| history
	components/python/jsonrpclib/Makefile	6 ●●●●● diff \| view \| raw \| blame \| history
	components/python/ldtp/Makefile	6 ●●●●● diff \| view \| raw \| blame \| history
	components/python/mako/Makefile	6 ●●●●● diff \| view \| raw \| blame \| history
	components/python/mock/Makefile	10 ●●●●● diff \| view \| raw \| blame \| history
	components/python/netaddr/Makefile	58 ●●●●● diff \| view \| raw \| blame \| history
	components/python/netaddr/netaddr-PYVER.p5m	81 ●●●●● diff \| view \| raw \| blame \| history
	components/python/netaddr/resolve.deps	4 ●●●●● diff \| view \| raw \| blame \| history
	components/python/nose/Makefile	4 ●●●●● diff \| view \| raw \| blame \| history
	components/python/pep8/Makefile	4 ●●●●● diff \| view \| raw \| blame \| history
	components/python/ply/Makefile	6 ●●●●● diff \| view \| raw \| blame \| history
	components/python/pybonjour/Makefile	6 ●●●●● diff \| view \| raw \| blame \| history
	components/python/python26/Makefile	2 ●●●●● diff \| view \| raw \| blame \| history
	components/python/python26/python-26-tests.p5m	30 ●●●●● diff \| view \| raw \| blame \| history
	components/python/python26/python-26.p5m	9 ●●●●● diff \| view \| raw \| blame \| history
	components/python/python27/Makefile	2 ●●●●● diff \| view \| raw \| blame \| history
	components/python/setuptools/Makefile	6 ●●●●● diff \| view \| raw \| blame \| history
	components/python/simplejson/Makefile	7 ●●●●● diff \| view \| raw \| blame \| history
	components/python/twisted-web2/Makefile	4 ●●●●● diff \| view \| raw \| blame \| history
	components/python/twisted/Makefile	8 ●●●●● diff \| view \| raw \| blame \| history
	components/rdiff-backup/Makefile	24 ●●●●● diff \| view \| raw \| blame \| history
	components/rdiff-backup/rdiff-backup-26.p5m	94 ●●●●● diff \| view \| raw \| blame \| history
	components/rdiff-backup/rdiff-backup-27.p5m	94 ●●●●● diff \| view \| raw \| blame \| history
	components/rdiff-backup/rdiff-backup-GENFRAG.p5m	31 ●●●●● diff \| view \| raw \| blame \| history
	components/rdiff-backup/rdiff-backup-PYVER.p5m	87 ●●●●● diff \| view \| raw \| blame \| history
	components/rdiff-backup/rdiff-backup.p5m	52 ●●●●● diff \| view \| raw \| blame \| history
	components/samba/samba/Makefile	4 ●●●●● diff \| view \| raw \| blame \| history
	components/samba/samba/samba.p5m	2 ●●●●● diff \| view \| raw \| blame \| history
	components/spawn-fcgi/Makefile	9 ●●●●● diff \| view \| raw \| blame \| history
	components/spawn-fcgi/spawn-fcgi.p5m	2 ●●●●● diff \| view \| raw \| blame \| history
	components/squid/Makefile	39 ●●●●● diff \| view \| raw \| blame \| history
	components/squid/files/http-squid	diff \| view \| raw \| blame \| history
	components/squid/files/http-squid.xml	diff \| view \| raw \| blame \| history
	components/squid/files/squid.conf.default	diff \| view \| raw \| blame \| history
	components/squid/squid.p5m	457 ●●●●● diff \| view \| raw \| blame \| history
	components/visual-panels/usermgr/src/apis/usermgr.xml	12 ●●●●● diff \| view \| raw \| blame \| history
	components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java	5 ●●●●● diff \| view \| raw \| blame \| history
	components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AuthRightsPanel.java	631 ●●●●● diff \| view \| raw \| blame \| history
	components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AuthRightsSettings.java	78 ●●●●● diff \| view \| raw \| blame \| history
	components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserManagedObject.java	32 ●●●●● diff \| view \| raw \| blame \| history
	components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java	6 ●●●●● diff \| view \| raw \| blame \| history
	components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/help/usermgr-advtab.html	5 ●●●●● diff \| view \| raw \| blame \| history
	components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/resources/Resources.properties	5 ●●●●● diff \| view \| raw \| blame \| history
	make-rules/ips-buildinfo.mk	4 ●●●●● diff \| view \| raw \| blame \| history
	make-rules/setup.py.mk	10 ●●●●● diff \| view \| raw \| blame \| history