Merge pull request #9 from gcheng/dev

Forward Integration from dev to AssetCRUD branch.
jianghaolu · Sep 17, 2012 · dfe25f3 · dfe25f3
2 parents 7e0f792 + 9e9be22
commit dfe25f3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 .project
 target
 node_modules
+.settings
+