Merge remote branch 'public/master'

This commit is contained in:
Michael Spang 2012-05-14 15:52:47 -04:00
commit 13d109b1ca
2 changed files with 5 additions and 3 deletions

View File

@ -6,13 +6,13 @@ profiles core;
profiles csclub office machine amd64 precise audio;
@maltodextrin
profiles csclub office machine amd64 precise;
profiles csclub office machine amd64 precise webcam;
@natural-flavours
profiles csclub office machine amd64 precise;
@bit-shifter
profiles csclub office machine amd64 precise;
profiles csclub office machine amd64 precise webcam;
@nullsleep
profiles csclub office machine amd64 precise audio;
@ -61,7 +61,7 @@ profiles csclub server machine amd64 squeeze;
profiles csclub server machine amd64 squeeze;
@artificial-flavours
profiles csclub server machine i386 squeeze;
profiles csclub server machine i386 squeeze mta;
# Computer Science Club Misc Machines

View File

@ -525,3 +525,5 @@ if @core {
network-manager-pptp-gnome network-manager
wpasupplicant;
};
@webcam install motion;