Before pull

	modified:   .netrwhist
Merge branch 'master' of github.com:rkadeFR/dotvim

Conflicts:
	.netrwhist

	modified:   .netrwhist
	modified:   .netrwhist.orig
	new file:   after/ftplugin/c.vim
	new file:   after/ftplugin/cpp.vim
	new file:   autoload/omni/common/debug.vim
	new file:   autoload/omni/common/utils.vim
	new file:   autoload/omni/cpp/complete.vim
	new file:   autoload/omni/cpp/includes.vim
	new file:   autoload/omni/cpp/items.vim
	new file:   autoload/omni/cpp/maycomplete.vim
	new file:   autoload/omni/cpp/namespaces.vim
	new file:   autoload/omni/cpp/settings.vim
	new file:   autoload/omni/cpp/tokenizer.vim
	new file:   autoload/omni/cpp/utils.vim
	new file:   doc/omnicppcomplete.txt
	new file:   doc/tags
	new file:   omnicppcomplete-0.41.zip
	new file:   tags/cpp
	new file:   tags/cpp_src/algorithm
	new file:   tags/cpp_src/allocator.h
	new file:   tags/cpp_src/basic_ios.h
	new file:   tags/cpp_src/basic_ios.tcc
	new file:   tags/cpp_src/basic_string.h
	new file:   tags/cpp_src/basic_string.tcc
	new file:   tags/cpp_src/bitset
	new file:   tags/cpp_src/boost_concept_check.h
	new file:   tags/cpp_src/cassert
	new file:   tags/cpp_src/cctype
	new file:   tags/cpp_src/cerrno
	new file:   tags/cpp_src/cfloat
	new file:   tags/cpp_src/char_traits.h
	new file:   tags/cpp_src/climits
	new file:   tags/cpp_src/clocale
	new file:   tags/cpp_src/cmath
	new file:   tags/cpp_src/cmath.tcc
	new file:   tags/cpp_src/codecvt.h
	new file:   tags/cpp_src/complex
	new file:   tags/cpp_src/concept_check.h
	new file:   tags/cpp_src/cpp_type_traits.h
	new file:   tags/cpp_src/csetjmp
	new file:   tags/cpp_src/csignal
	new file:   tags/cpp_src/cstdarg
	new file:   tags/cpp_src/cstddef
	new file:   tags/cpp_src/cstdio
	new file:   tags/cpp_src/cstdlib
	new file:   tags/cpp_src/cstring
	new file:   tags/cpp_src/ctime
	new file:   tags/cpp_src/cwchar
	new file:   tags/cpp_src/cwctype
	new file:   tags/cpp_src/deque
	new file:   tags/cpp_src/deque.tcc
	new file:   tags/cpp_src/exception
	new file:   tags/cpp_src/exception_defines.h
	new file:   tags/cpp_src/fstream
	new file:   tags/cpp_src/fstream.tcc
	new file:   tags/cpp_src/functexcept.h
	new file:   tags/cpp_src/functional
	new file:   tags/cpp_src/gslice.h
	new file:   tags/cpp_src/gslice_array.h
	new file:   tags/cpp_src/indirect_array.h
	new file:   tags/cpp_src/iomanip
	new file:   tags/cpp_src/ios
	new file:   tags/cpp_src/ios_base.h
	new file:   tags/cpp_src/iosfwd
	new file:   tags/cpp_src/iostream
	new file:   tags/cpp_src/istream
	new file:   tags/cpp_src/istream.tcc
	new file:   tags/cpp_src/iterator
	new file:   tags/cpp_src/limits
	new file:   tags/cpp_src/list
	new file:   tags/cpp_src/list.tcc
	new file:   tags/cpp_src/locale
	new file:   tags/cpp_src/locale_classes.h
	new file:   tags/cpp_src/locale_facets.h
	new file:   tags/cpp_src/locale_facets.tcc
	new file:   tags/cpp_src/localefwd.h
	new file:   tags/cpp_src/map
	new file:   tags/cpp_src/mask_array.h
	new file:   tags/cpp_src/memory
	new file:   tags/cpp_src/new
	new file:   tags/cpp_src/numeric
	new file:   tags/cpp_src/ostream
	new file:   tags/cpp_src/ostream.tcc
	new file:   tags/cpp_src/ostream_insert.h
	new file:   tags/cpp_src/postypes.h
	new file:   tags/cpp_src/queue
	new file:   tags/cpp_src/set
	new file:   tags/cpp_src/slice_array.h
	new file:   tags/cpp_src/sstream
	new file:   tags/cpp_src/sstream.tcc
	new file:   tags/cpp_src/stack
	new file:   tags/cpp_src/stdexcept
	new file:   tags/cpp_src/stl_algo.h
	new file:   tags/cpp_src/stl_algobase.h
	new file:   tags/cpp_src/stl_bvector.h
	new file:   tags/cpp_src/stl_construct.h
	new file:   tags/cpp_src/stl_deque.h
	new file:   tags/cpp_src/stl_function.h
	new file:   tags/cpp_src/stl_heap.h
	new file:   tags/cpp_src/stl_iterator.h
	new file:   tags/cpp_src/stl_iterator_base_funcs.h
	new file:   tags/cpp_src/stl_iterator_base_types.h
	new file:   tags/cpp_src/stl_list.h
	new file:   tags/cpp_src/stl_map.h
	new file:   tags/cpp_src/stl_multimap.h
	new file:   tags/cpp_src/stl_multiset.h
	new file:   tags/cpp_src/stl_numeric.h
	new file:   tags/cpp_src/stl_pair.h
	new file:   tags/cpp_src/stl_queue.h
	new file:   tags/cpp_src/stl_raw_storage_iter.h
	new file:   tags/cpp_src/stl_relops.h
	new file:   tags/cpp_src/stl_set.h
	new file:   tags/cpp_src/stl_stack.h
	new file:   tags/cpp_src/stl_tempbuf.h
	new file:   tags/cpp_src/stl_tree.h
	new file:   tags/cpp_src/stl_uninitialized.h
	new file:   tags/cpp_src/stl_vector.h
	new file:   tags/cpp_src/stream_iterator.h
	new file:   tags/cpp_src/streambuf
	new file:   tags/cpp_src/streambuf.tcc
	new file:   tags/cpp_src/streambuf_iterator.h
	new file:   tags/cpp_src/string
	new file:   tags/cpp_src/stringfwd.h
	new file:   tags/cpp_src/typeinfo
	new file:   tags/cpp_src/utility
	new file:   tags/cpp_src/valarray
	new file:   tags/cpp_src/valarray_after.h
	new file:   tags/cpp_src/valarray_array.h
	new file:   tags/cpp_src/valarray_array.tcc
	new file:   tags/cpp_src/valarray_before.h
	new file:   tags/cpp_src/vector
	new file:   tags/cpp_src/vector.tcc
	new file:   tags/qt4
	modified:   vimrc