Merge pull request #2 from ehsteve/master

Updates and added SPD 2014 poster
sunpy · Jun 6, 2014 · b193cc7 · b193cc7
2 parents 9eaf8cb + d18d086
commit b193cc7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,19 @@
+### https://raw.github.com/github/gitignore/master/Global/osx.gitignore
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must ends with two \r.
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Illustrator files
+*.ai
diff --git a/2012-11-27_SunPy-Poster_SolarInSonoma_(Petaluma)/SunPy_Petaluma_Poster2.pdf b/2012-11-27_SunPy-Poster_SolarInSonoma_(Petaluma)/SunPy_Petaluma_Poster2.pdf
diff --git a/2013-06-08_SunPy-Poster_SPD_(Bozeman)/SunPy_SPD_Poster.odg b/2013-06-08_SunPy-Poster_SPD_(Bozeman)/SunPy_SPD_Poster.odg
diff --git a/2013-06-08_SunPy-Poster_SPD_(Bozeman)/SunPy_SPD_Poster.pdf b/2013-06-08_SunPy-Poster_SPD_(Bozeman)/SunPy_SPD_Poster.pdf
diff --git a/2014-06-04_SunPy-Poster_SPD_(Boston)/SunPy-0.4-AAS-SPD Poster.pdf b/2014-06-04_SunPy-Poster_SPD_(Boston)/SunPy-0.4-AAS-SPD Poster.pdf