summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel@free.fr>2011-01-02 18:37:35 +0100
committersibel <lesibel@free.fr>2011-01-02 18:37:35 +0100
commit82066c7c60ed0cf8932efd59b2db2c9bac6ad53b (patch)
treea6fa4d5d665196a51408549b2eeb61be742b0fe3
parent3955c1dc5831d29441b6c4cd0efe1da03f5a0637 (diff)
parent081bd4ab79fdf793ee4806c37f37ea556d5e8fc3 (diff)
downloadnutyx-extra-82066c7c60ed0cf8932efd59b2db2c9bac6ad53b.tar.gz
nutyx-extra-82066c7c60ed0cf8932efd59b2db2c9bac6ad53b.tar.bz2
nutyx-extra-82066c7c60ed0cf8932efd59b2db2c9bac6ad53b.tar.xz
nutyx-extra-82066c7c60ed0cf8932efd59b2db2c9bac6ad53b.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
-rw-r--r--base/kernel-36/.footprint2
-rw-r--r--base/kernel-36/.md5sum8
2 files changed, 5 insertions, 5 deletions
diff --git a/base/kernel-36/.footprint b/base/kernel-36/.footprint
index 6e4298164..94b5f9313 100644
--- a/base/kernel-36/.footprint
+++ b/base/kernel-36/.footprint
@@ -1304,7 +1304,7 @@ drwxr-xr-x root/root lib/modules/2.6.36-NuTyX/kernel/sound/usb/usx2y/
lrwxrwxrwx root/root lib/modules/2.6.36-NuTyX/source -> /usr/src/linux-2.6.36
drwxr-xr-x root/root root/
drwxr-xr-x root/root root/bin/
--rwxr-xr-x root/root root/bin/install-attapu.1.ash
+-rwxr-xr-x root/root root/bin/install-pakxe.ash
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/src/
drwxr-xr-x root/root usr/src/linux-2.6.36/
diff --git a/base/kernel-36/.md5sum b/base/kernel-36/.md5sum
index 9893f005c..443a44bb6 100644
--- a/base/kernel-36/.md5sum
+++ b/base/kernel-36/.md5sum
@@ -1,7 +1,7 @@
3d95cb46907c7451ca0c96fa533b4d91 config
-e471fe39dac3d2c6315b7496720b26e8 config_64
-9d17fd1c6e89e6c53e2517f2d1d6284c install-attapu.1.ash
-b05761151987f1d925770e0980464cc5 installtools-11122010.tar.gz
+05dc43b85b8810d586c124938e7f71cb config_64
+0a96ad9ede2ed23d26f43acae37f8cd0 install-pakxe.ash
+35cf41296ce337b64d2f8ab799030a1a installtools-02012011.tar.bz2
61f3739a73afb6914cb007f37fb09b62 linux-2.6.36.tar.bz2
-e1432a49e8f7b03c276210729474988a nutyx-initrd-extra-31102010.tar.bz2
+c7ca8c0ccb8b8cbf0d95218e48996223 nutyx-initrd-x86_64-02012011.tar.bz2
4b01c5f9657a9587b262df5f8d784116 patch-2.6.36.2.bz2