aboutsummaryrefslogtreecommitdiffstats
path: root/packages/apache
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-05 16:39:59 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-05 16:39:59 +0000
commit6314c1d8078f2f6ab0c73a36d20bc8c9c378b4f8 (patch)
tree6d6f0abcb723ef6f9aad1751b85ae9f84fa8f74b /packages/apache
parentbe8a8aee064feb50cc3dd13a67487c9b95aeee02 (diff)
downloadopenembedded-6314c1d8078f2f6ab0c73a36d20bc8c9c378b4f8.tar.gz
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/05 18:01:03+02:00 uni-frankfurt.de!mickeyl upgrade openzaurus 3.5.4.conf and revert 1.3211 + add a note about that 2005/05/05 16:29:35+02:00 uni-frankfurt.de!mickeyl add wlan-ng-modules 0.2.1-pre26. DEFAULT_PREFERENCE=-1 for now since it has build problems on certain kernels. BKrev: 427a4c5fCgevI4GjFZMNn-fZa-K6_w
Diffstat (limited to 'packages/apache')
-rw-r--r--packages/apache/files/httpd.conf (renamed from packages/apache/apache-2.0.48/init)0
-rw-r--r--packages/apache/files/init0
2 files changed, 0 insertions, 0 deletions
diff --git a/packages/apache/apache-2.0.48/init b/packages/apache/files/httpd.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/apache/apache-2.0.48/init
+++ b/packages/apache/files/httpd.conf
diff --git a/packages/apache/files/init b/packages/apache/files/init
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/apache/files/init