projects
/
people
/
pmueller
/
ipfire-2.x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
999d55d
b73866f
)
Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
author
Arne Fitzenreiter
<arne_f@ipfire.org>
Mon, 20 Apr 2009 17:39:10 +0000
(19:39 +0200)
committer
Arne Fitzenreiter
<arne_f@ipfire.org>
Mon, 20 Apr 2009 17:39:10 +0000
(19:39 +0200)
Conflicts:
make.sh
1
2
make.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
make.sh
index 30bf69ff31b425d943fc27c1f99a312fce3c28ce,dadf2ff6e5f3a51d21748409be569a62f22a617a..b15bf80719ea7ee0db56a5d21ea93c6db7e2cf6a
---
1
/
make.sh
---
2
/
make.sh
+++ b/
make.sh
@@@
-345,8
-345,7
+345,9
@@@
buildipfire()
ipfiremake alsa KMOD=1
ipfiremake openswan KMOD=1
ipfiremake mISDN
+ ipfiremake which
+ ipfiremake compat-wireless
+ ipfiremake linux XEN=1
ipfiremake pkg-config
ipfiremake linux-atm
ipfiremake cpio