diff options
author | hut <hut@lavabit.com> | 2010-04-07 15:50:08 +0200 |
---|---|---|
committer | hut <hut@lavabit.com> | 2010-04-07 15:50:08 +0200 |
commit | 8d89c6f3a7cf6b0c8abc2ff68ecc7201ac08e872 (patch) | |
tree | 610dd3acfdac10ebe1d766a779897207ea6dfb33 /doc/uml/cpp_includes | |
parent | 55435343b142c424619e3072475ca8b3366d109c (diff) | |
parent | f45f9734d2ff9fd6b68ff6c879d5b07b0e5c7d02 (diff) | |
download | ranger-8d89c6f3a7cf6b0c8abc2ff68ecc7201ac08e872.tar.gz |
Merge branch 'devel' into newkey
Conflicts: ranger/core/actions.py ranger/defaults/keys.py ranger/ext/direction.py ranger/gui/ui.py ranger/gui/widgets/browserview.py ranger/gui/widgets/pager.py
Diffstat (limited to 'doc/uml/cpp_includes')
-rw-r--r-- | doc/uml/cpp_includes | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/doc/uml/cpp_includes b/doc/uml/cpp_includes deleted file mode 100644 index 531b86f7..00000000 --- a/doc/uml/cpp_includes +++ /dev/null @@ -1,13 +0,0 @@ -// "a type" "needed cpp_includes" -"vector" "#include <vector> -using namespace std;" - -"list" "#include <list> -using namespace std;" - -"map" "#include <map> -using namespace std;" - -"string" "#include <string> -using namespace std;" - |