| commit | c59f7853ea99c546bdc676442f2410ce1bef5e75 | |
| author | Adam Stevko <adam.stevko@gmail.com> | |
| Thu, 4 Jul 2013 11:10:04 +0000 (4 13:10 +0200) | ||
| committer | Adam Stevko <adam.stevko@gmail.com> | |
| Thu, 4 Jul 2013 11:11:37 +0000 (4 13:11 +0200) | ||
| tree | 8aaebfcce5015e6fc4fa55e5b1f2bf77fa532126 | treesnapshot (tar.gz zip) |
| parent | 2e0061aa13d05a45c7fd7826d493415e51c584f6 | commitdiff |
| parent | 6992923b82937b45c00720fccef2cb4264fc3424 | commitdiff |
Disable socat
Merge branch 'oi/hipster' of https://github.com/OpenIndiana/oi-userland into oi/hipster
Conflicts:
components/components.ignore
Merge branch 'oi/hipster' of https://github.com/OpenIndiana/oi-userland into oi/hipster
Conflicts:
components/components.ignore
| components/components.ignore | diff1 | diff2 | blobhistory |