Permalink
Browse files

merge upstream

  • Loading branch information...
2 parents 59fa344 + 0882e6d commit 667a3163779472a708307dec3104f917f472f789 @tonymorris committed Mar 31, 2012
Showing with 20 additions and 3 deletions.
  1. +17 −0 .gitignore
  2. +1 −1 LICENSE
  3. +2 −2 OSM.lkshw
View
@@ -1,2 +1,19 @@
+*~
+*#*
+
+# CABAL
dist
+
+# Haskell Program Coverage
+.hpc
+
+# Leksah
*.lkshs
+
+# Intellij IDEA
+.idea/workspace.xml
+.idea/ant.xml
+
+# ctags
+TAGS
+
View
@@ -1,4 +1,4 @@
-Copyright 2011 Tony Morris
+Copyright 2012 Tony Morris, Thomas DuBuisson
All rights reserved.
View
@@ -1,10 +1,10 @@
Version of workspace file format:
1
Time of storage:
- "Thu Oct 14 10:59:30 EST 2010"
+ "Mon Jan 10 08:54:11 EST 2012"
Name of the workspace:
"OSM"
File paths of contained packages:
["OSM.cabal"]
Maybe file path of an active package:
- Just "OSM.cabal"
+ Just "OSM.cabal"

0 comments on commit 667a316

Please sign in to comment.