Merge remote-tracking branch 'origin/master' into ipv6

freeminer · May 11, 2014 · 3963c69 · 3963c69
2 parents 3586b8a + 47c8379
commit 3963c69
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+CMakeFiles/*
+Makefile
+cmake_install.cmake
+libenet.a