Merge branch 'master' of https://github.com/hawesie/rosdistro into ha…

…wesie-master Conflicts: rosdep/osx-homebrew.yaml
f1ori · Jul 23, 2013 · 5fd378d · 5fd378d
2 parents e1a7db6 + 06e50bb
commit 5fd378d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/rosdep/osx-homebrew.yaml b/rosdep/osx-homebrew.yaml
@@ -141,6 +141,10 @@ libflann-dev:
  osx:
  homebrew:
  package: [flann]
+libgsl:
+ osx:
+ homebrew:
+ packages: [gsl]
 libjpeg:
  osx:
  homebrew: