[gentoo-commits] proj/sci:master commit in: /

[Justin Lecher]

commit:     7d975529d842c1bde9ca591f4573b308c8bb73a3
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 19:44:07 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 19:44:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7d975529

Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci; github.com:gentoo-science/sci

* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci:

* github.com:gentoo-science/sci:
  Removed the TODO item for the desktop file
  Added rstudio-0.96.331 and desktop file fix


 sci-mathematics/rstudio/Manifest                   |    9 +++++----
 ...nker_flags.patch => rstudio-linker_flags.patch} |    0
 ...io-0.96.316-paths.patch => rstudio-paths.patch} |    0
 ...io-0.96.316-prefs.patch => rstudio-prefs.patch} |    0
 .../rstudio/files/rstudio.desktop.patch            |   16 ++++++++++++++++
 sci-mathematics/rstudio/rstudio-0.96.316.ebuild    |   11 ++++++-----
 ...dio-0.96.316.ebuild => rstudio-0.96.331.ebuild} |   11 ++++++-----
 7 files changed, 33 insertions(+), 14 deletions(-)