diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-04-07 08:50:06 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-04-07 08:50:06 +0200 |
| commit | 1a36ef888295afd6592d617a7b3657386133d43f (patch) | |
| tree | d65a58beb1f7e76ba4261f4831c55de258e7bc1c /base-install.sh | |
| parent | 721feafdb56c18fb7424d505377abe80d78f4e7b (diff) | |
| parent | eb936c2d958e3ac2422bcecd073c8e0ef1a60abf (diff) | |
Merge conflicts
Diffstat (limited to 'base-install.sh')
| -rw-r--r--[-rwxr-xr-x] | base-install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base-install.sh b/base-install.sh index 22edce9..03512fe 100755..100644 --- a/base-install.sh +++ b/base-install.sh @@ -27,7 +27,7 @@ fi touch $OT_UI_CONF # Pkgs -packs="lsb-release binutils gcc g++ gfortran wget hostname pwgen git-core raptor-utils r-base sun-java6-jdk libssl-dev zlib1g-dev libreadline-dev libmysqlclient-dev libcurl4-openssl-dev libxml2-dev libxslt1-dev libgsl0-dev sun-java6-jdk libreadline5-dev" +packs="lsb-release binutils gcc g++ gfortran wget hostname pwgen git-core raptor-utils r-base sun-java6-jdk libssl-dev zlib1g-dev libreadline-dev libmysqlclient-dev libcurl4-openssl-dev libxml2-dev libxslt1-dev libgsl0-dev sun-java6-jdk libreadline5-dev r-base-dev " echo echo "Base Packages:" |