Merge branch 'neosnippet' of github.com:Shougo/neocomplcache-snippets-complete into neosnippet

autoload/neosnippet/snippets/cpp.snip

@@ -35,3 +35,41 @@ snippet     enum_scoped
 abbr        enum struct {}
     enum struct { ${1} }
 
+# static assert ( C++11 feature )
+snippet     static_assert
+abbr        static_assert(,"")
+    static_assert( ${1}, "${2}" );${0}
+
+delete      namespace
+snippet     namespace
+abbr        namespace {}
+prev_word   '^'
+    namespace ${1:name}
+        ${0}
+    } // namespace $1
+
+snippet     static_cast
+abbr        static_cast<>()
+    static_cast<${1}>(${2})${0}
+
+snippet     reinterpret_cast
+abbr        reinterpret_cast<>()
+    reinterpret_cast<${1}>(${2})${0}
+
+snippet     const_cast
+abbr        const_cast<>()
+    const_cast<${1}>(${2})${0}
+
+snippet     dynamic_cast
+abbr        dynamic_cast<>()
+    dynamic_cast<${1}>(${2})${0}
+
+snippet helloworld
+abbr        #include<iostream>\nint main...
+    #include <iostream>
+    int main(int argc, char const* argv[])
+    {
+        using namespace std;
+        cout << "hello, world!" << endl;
+        return 0;
+    }

autoload/neosnippet/snippets/lua.snip

@@ -1,3 +1,4 @@
+# lua's indent plugin doesn't work well partly with markers. Use hard-tab for some of this snippet.
 snippet func
 alias   function
 	function ${1:function_name}(${2:argument})
@@ -18,3 +19,9 @@ snippet forin
   for ${2:k}, ${3:v} in ${1:ipairs(xs)} do
     ${0}
   end
+
+snippet print_table
+abbr    for k, v in ipairs(table) do
+  for (k, v) in ipairs(${1:table}) do
+    print(k, v)
+  end

doc/neosnippet.txt

@@ -409,6 +409,10 @@ snippet					*neosnippet-unite-action-snippet*
 ==============================================================================
 CHANGELOG			*neosnippet-changelog*
 
+2012-10-15
+- Improved lua snip.
+- Improved c++ snip.
+
 2012-10-07
 - Improved vim snip.
 - Improved c snip.