diff options
author | Michael Hanson <mihanson@linhes.org> | 2012-02-21 21:51:20 (GMT) |
---|---|---|
committer | Michael Hanson <mihanson@linhes.org> | 2012-02-21 21:51:20 (GMT) |
commit | 45f1741a1b3bb8acef870b64852261b6f19ca806 (patch) | |
tree | 113239a697067d28fa39ac7d57deef5494dc0bf4 | |
parent | ccafc53c03852163cd67a63ce45577209da3ab20 (diff) | |
parent | 248fc74e7b2bca2c91fa12fb457a209355906c54 (diff) | |
download | linhes_dev-45f1741a1b3bb8acef870b64852261b6f19ca806.zip |
Merge branch 'testing' of linhes.org:linhes_dev into testing
5 files changed, 0 insertions, 5 deletions
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks index f03d321..e2cece2 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks +++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks @@ -213,7 +213,6 @@ mplayer-wrapper #atl1e linux-firmware -hd3000firmware larch-live mkinitcpio-busybox diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks index f03d321..e2cece2 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks @@ -213,7 +213,6 @@ mplayer-wrapper #atl1e linux-firmware -hd3000firmware larch-live mkinitcpio-busybox diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks index f03d321..e2cece2 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks @@ -213,7 +213,6 @@ mplayer-wrapper #atl1e linux-firmware -hd3000firmware larch-live mkinitcpio-busybox diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks index f03d321..e2cece2 100755 --- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks +++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks @@ -213,7 +213,6 @@ mplayer-wrapper #atl1e linux-firmware -hd3000firmware larch-live mkinitcpio-busybox diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks index f03d321..e2cece2 100755 --- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks +++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks @@ -213,7 +213,6 @@ mplayer-wrapper #atl1e linux-firmware -hd3000firmware larch-live mkinitcpio-busybox |