Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • sugu/camtron
1 result
Select Git revision
Show changes
Commits on Source (1)
  • am0ebe's avatar
    . · b6e38aaa
    am0ebe authored
    b6e38aaa
......@@ -32,3 +32,4 @@ upload.sh
*.sublime-workspace
README.html
*sublime-workspace
camtron.sublime-workspace
......@@ -7,6 +7,192 @@
},
"buffers":
[
{
"file": "/home/sugu/code/idiv/camtron_all/dox/todo_tron",
"settings":
{
"buffer_size": 3221,
"encoding": "UTF-8",
"line_ending": "Unix"
},
"undo_stack":
[
[
4,
1,
"insert",
{
"characters": "\n"
},
"AQAAAM8AAAAAAAAA0AAAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAAzwAAAAAAAADPAAAAAAAAAAAAAAAAkHdA"
],
[
5,
1,
"reindent",
null,
"AQAAANAAAAAAAAAA0QAAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAA0AAAAAAAAADQAAAAAAAAAAAAAAAAAPC/"
],
[
6,
1,
"insert",
{
"characters": ">"
},
"AQAAANEAAAAAAAAA0gAAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAA0QAAAAAAAADRAAAAAAAAAAAAAAAAAPC/"
],
[
7,
1,
"insert",
{
"characters": " buy"
},
"BAAAANIAAAAAAAAA0wAAAAAAAAAAAAAA0wAAAAAAAADUAAAAAAAAAAAAAADUAAAAAAAAANUAAAAAAAAAAAAAANUAAAAAAAAA1gAAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAA0gAAAAAAAADSAAAAAAAAAAAAAAAAAPC/"
],
[
8,
1,
"insert",
{
"characters": " hw"
},
"AwAAANYAAAAAAAAA1wAAAAAAAAAAAAAA1wAAAAAAAADYAAAAAAAAAAAAAADYAAAAAAAAANkAAAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAA1gAAAAAAAADWAAAAAAAAAAAAAAAAAPC/"
],
[
9,
2,
"left_delete",
null,
"AgAAANgAAAAAAAAA2AAAAAAAAAABAAAAd9cAAAAAAAAA1wAAAAAAAAABAAAAaA",
"AQAAAAAAAAABAAAA2QAAAAAAAADZAAAAAAAAAAAAAAAAAPC/"
],
[
10,
1,
"insert",
{
"characters": "chambers."
},
"CQAAANcAAAAAAAAA2AAAAAAAAAAAAAAA2AAAAAAAAADZAAAAAAAAAAAAAADZAAAAAAAAANoAAAAAAAAAAAAAANoAAAAAAAAA2wAAAAAAAAAAAAAA2wAAAAAAAADcAAAAAAAAAAAAAADcAAAAAAAAAN0AAAAAAAAAAAAAAN0AAAAAAAAA3gAAAAAAAAAAAAAA3gAAAAAAAADfAAAAAAAAAAAAAADfAAAAAAAAAOAAAAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAA1wAAAAAAAADXAAAAAAAAAAAAAAAAAPC/"
],
[
11,
1,
"left_delete",
null,
"AQAAAN8AAAAAAAAA3wAAAAAAAAABAAAALg",
"AQAAAAAAAAABAAAA4AAAAAAAAADgAAAAAAAAAAAAAAAAAPC/"
],
[
15,
1,
"cut",
null,
"AQAAAPwAAAAAAAAA/AAAAAAAAAAZAAAAMjAga+KCrCBmb3IgdGhlcm1vY2hhbWJlcg",
"AQAAAAAAAAABAAAAEwEAAAAAAAD8AAAAAAAAAAAAAAAAgFNA"
],
[
17,
2,
"left_delete",
null,
"AgAAAPoAAAAAAAAA+gAAAAAAAAACAAAACQn5AAAAAAAAAPkAAAAAAAAAAQAAAAo",
"AQAAAAAAAAABAAAA/AAAAAAAAAD6AAAAAAAAAAAAAAAAAAAA"
]
]
},
{
"file": "/home/sugu/code/idiv/camtron_all/dox/notes_A",
"settings":
{
"buffer_size": 1474,
"encoding": "UTF-8",
"line_ending": "Unix"
},
"undo_stack":
[
[
3,
1,
"insert",
{
"characters": "\n"
},
"AQAAAAkBAAAAAAAACgEAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAACQEAAAAAAAAJAQAAAAAAAAAAAAAAAPC/"
],
[
4,
1,
"paste",
null,
"AQAAAAoBAAAAAAAAIQEAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAACgEAAAAAAAAKAQAAAAAAAAAAAAAAAPC/"
],
[
6,
1,
"swap_line_down",
null,
"AgAAADIBAAAAAAAASgEAAAAAAAAAAAAACgEAAAAAAAAKAQAAAAAAABoAAAAyMCBr4oKsIGZvciB0aGVybW9jaGFtYmVyCg",
"AQAAAAAAAAABAAAAIQEAAAAAAAAKAQAAAAAAAAAAAAAAAAAA"
],
[
7,
1,
"insert",
{
"characters": "\t"
},
"AgAAABoBAAAAAAAAGwEAAAAAAAAAAAAAGwEAAAAAAAAbAQAAAAAAABkAAAAyMCBr4oKsIGZvciB0aGVybW9jaGFtYmVy",
"AQAAAAAAAAABAAAAMQEAAAAAAAAaAQAAAAAAAAAAAAAAAAAA"
],
[
8,
1,
"paste",
null,
"AQAAABsBAAAAAAAAMgEAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAAGwEAAAAAAAAbAQAAAAAAAAAAAAAAAPC/"
],
[
9,
1,
"swap_line_down",
null,
"AgAAAFMBAAAAAAAAbAEAAAAAAAAAAAAAGgEAAAAAAAAaAQAAAAAAABsAAAAJMjAga+KCrCBmb3IgdGhlcm1vY2hhbWJlcgo",
"AQAAAAAAAAABAAAAMgEAAAAAAAAyAQAAAAAAAAAAAAAAAPC/"
],
[
11,
1,
"insert",
{
"characters": "\t>"
},
"AgAAADsBAAAAAAAAPAEAAAAAAAAAAAAAPAEAAAAAAAA9AQAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAAOwEAAAAAAAA7AQAAAAAAAAAAAAAAgENA"
],
[
12,
1,
"insert",
{
"characters": " "
},
"AQAAAD0BAAAAAAAAPgEAAAAAAAAAAAAA",
"AQAAAAAAAAABAAAAPQEAAAAAAAA9AQAAAAAAAAAAAAAAAPC/"
]
]
}
],
"build_system": "Packages/User/c++_project.sublime-build",
"build_system_choices":
......@@ -40,10 +226,60 @@
},
"expanded_folders":
[
"/home/sugu/code/idiv/camtron_all/c",
"/home/sugu/code/idiv/camtron_all/dox"
],
"file_history":
[
"/home/sugu/dox/cmds/cmds2.sh",
"/home/sugu/.bash_aliases",
"/home/sugu/.bashrc",
"/home/sugu/code/bash/fa.sh",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/bar.odp",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/foo",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/foo\\ bar.odp",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/foo bar.odp",
"/home/sugu/dox/tech/ai/foo\\ bar.pdf2",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/'./foo",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/bar.odp'",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/'./Dizionario",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/SALUTI",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/E",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/PRESENTAZIONI.odp'",
"/home/sugu/dox/lang/it/IT-A2/Unità 1/Dizionario - Unità1 - SALUTI E PRESENTAZIONI.odp",
"/home/sugu/dox/lang/it/IT-A2/Unità 6/Unità",
"/home/sugu/dox/lang/it/IT-A2/Unità 6/6",
"/home/sugu/code/python/extract_links.py",
"/home/sugu/dox/tech/cf/cf-download-project/extract_links.py",
"/home/sugu/dox/idiv/ecotron/timePi/pi/.python_history",
"/home/sugu/dox/bureau/can/IMM5950_1-J97PYDL.pdf",
"/home/sugu/dox/tech/sql/Lecture-06-INSERT-and-COPY.pdf",
"/home/sugu/dox/tech/sql/copy.csv",
"/home/sugu/dox/idiv/.pytest_cache/README.md",
"/home/sugu/dox/idiv/schrebatron/timePi-code/rft2node/bin/restart.py",
"/home/sugu/dox/cmds/cmds1.sh",
"/home/sugu/code/python/util/mousecoord.py",
"/home/sugu/code/python/util/util.py",
"/home/sugu/code/bash/backup.sh",
"/home/sugu/code/bash/commandToAll.sh",
"/home/sugu/code/bash/deploy.sh",
"/home/sugu/code/bash/findAndDiffFileBetweenBranches.sh",
"/home/sugu/code/bash/findCode.sh",
"/home/sugu/code/bash/findSerial.sh",
"/home/sugu/code/bash/functionBla.sh",
"/home/sugu/code/bash/git_repo.sh",
"/home/sugu/code/bash/git_ShowChangesNthCommitFromHead.sh",
"/home/sugu/code/bash/git_toggleBran.sh",
"/home/sugu/code/bash/horas.sh",
"/home/sugu/code/bash/loc.sh",
"/home/sugu/code/bash/resetDateTimeZoneIndependt.sh",
"/home/sugu/code/bash/restore.sh",
"/home/sugu/code/bash/run_terminator.sh",
"/home/sugu/code/bash/updateVersion.sh",
"/home/sugu/code/python/foo.py",
"/home/sugu/code/exercism/python/bob/bob.py",
"/home/sugu/dox/idiv/misc/hardware-kosten-ecotron.ods",
"/home/sugu/dox/idiv/camtron/.~lock.hardware-kosten-camtron.ods#",
"/home/sugu/code/idiv/camtron_all/c/camtron.sublime-project",
"/home/sugu/code/idiv/camtron_all/b/VimbaCPP/Examples/ListCameras/Source/program.cpp",
"/home/sugu/code/idiv/camtron_all/b/VimbaCPP/Examples/ListCameras/Source/ListCameras.h",
......@@ -122,51 +358,11 @@
"/home/m/dox/lang/fr/b2/2/stolen-bikebag",
"/usr/local/bin/run_terminator.sh",
"/home/m/.config/sublime-text/Packages/User/c++_project.sublime-build",
"/home/m/code/c++/bookmark_merger/joli.json",
"/home/m/.config/user/bookmarx/bookmarks-empty.json",
"/home/m/code/c++/bookmark_merger/merger.cpp",
"/home/m/dox/bureau/study_again?",
"/home/m/.config/terminator/config",
"/home/m/.config/user/bookmarx/bookmarks-sugu.json",
"/home/m/.bashrc",
"/home/m/git_repo.sh",
"/home/m/dox/todo/todo_fr",
"/home/m/dox/sport/sport",
"/home/m/dox/sport/sport_bjj",
"/home/m/dox/cmds/cmds.py",
"/home/m/dox/sport/lost",
"/opt/sport/gracie-combatives/notes",
"/home/m/.dircolors",
"/home/m/code/bash/run_terminator.sh",
"/home/m/code/idiv/synconf/.git/COMMIT_EDITMSG",
"/home/m/bla",
"/home/m/dox/cmds/cmds1.sh",
"/home/m/config",
"/home/m/.config/user-dirs.dirs",
"/home/m/.config/user-dirs.locale",
"/home/m/code/c++/bookmark_merger/bookmarks_firefox.py",
"/home/m/code/idiv/synconf/sync/.bash_aliases",
"/home/m/code/python/quotes.py",
"/home/m/dox/cmds/cmds2.sh",
"/home/m/dox/todo/todo_code",
"/home/m/code/python/util.py",
"/home/m/m/.bash_aliases",
"/home/m/code/idiv/synconf/sync/dox/priv/quotes",
"/home/m/.gitconfig",
"/home/m/code/bash/restore.sh",
"/home/m/.thunderbird/ietlzorz.default-release/favicons.sqlite-wal",
"/home/m/.config/gtk-3.0/bookmarks",
"/home/m/.config/user/browseFiles/dox_filelist",
"/home/m/.config/user/browseFiles/cpp_filelist",
"/home/m/.config/user/browseFiles/todo_filelist",
"/home/m/.config/user/browseFiles/cmds_filelist",
"/home/m/todo_code",
"/home/m/code/python/browseFiles.py",
"/home/m/hackbert"
"/home/m/code/c++/bookmark_merger/joli.json"
],
"find":
{
"height": 34.0
"height": 47.0
},
"find_in_files":
{
......@@ -180,6 +376,48 @@
"case_sensitive": false,
"find_history":
[
"isDoc",
"isMedia",
"o(",
"DOC",
"doc",
"SUFFIX_DOC",
"isDoc",
"o(",
"cmds",
"file",
"clear",
"isBinary",
"I",
"i",
"alias",
"Alias",
"alias",
"find_in_files_and_open_at_pos",
"return",
"audvids",
"o(",
"o*",
"cmds",
"file",
"vlc",
"binar",
"]]; then",
"binar",
"isNumber",
"is",
"find_in_files_and_open_at_pos",
"xclude_files",
"suffix",
"suffix_media",
"isAudioOrVideo",
"arg",
"endsWith",
"sfx",
"o(",
"o=",
"find_in_files_and_open_at_pos",
"sff",
"StreamSystemInfo",
"ErrorCodeToMessage",
"exception",
......@@ -265,49 +503,7 @@
"massCenters",
"ConvexHull",
"convexHull",
"ConvexHull",
"convexhull",
"ConvexHull",
"convexHull",
"conHull",
"masscenters",
"massCenters",
"minRect",
"contourRect",
"minRect",
"recCenterPoints",
"center",
"recCenterPoints",
"Moments",
"moments",
"Moments",
"moments",
"Moments",
"moments",
"massCenters",
"contourSelection",
"ContourSelection",
"contourSelection",
"ContourSelection",
"contourSelection",
"contours",
"ext",
"contourSelection",
"archive",
"ARCHIVE",
"archive",
"ARCHIVE",
"archive",
"toFrameNumber",
"glob",
"np",
"algorithms",
"bgs",
"cv2",
"numpy",
"np",
"pay",
"plok"
"ConvexHull"
],
"highlight": true,
"in_selection": false,
......@@ -315,6 +511,7 @@
"regex": false,
"replace_history":
[
"isMedia",
"rel",
"~/.config/user/dircolors/night",
"${verb}",
......@@ -335,12 +532,75 @@
{
"sheets":
[
{
"buffer": 0,
"file": "/home/sugu/code/idiv/camtron_all/dox/todo_tron",
"selected": true,
"semi_transient": false,
"settings":
{
"buffer_size": 3221,
"regions":
{
},
"selection":
[
[
249,
249
]
],
"settings":
{
"syntax": "Packages/Text/Plain text.tmLanguage",
"tab_size": 3,
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 0,
"stack_multiselect": false,
"type": "text"
},
{
"buffer": 1,
"file": "/home/sugu/code/idiv/camtron_all/dox/notes_A",
"semi_transient": false,
"settings":
{
"buffer_size": 1474,
"regions":
{
},
"selection":
[
[
281,
281
]
],
"settings":
{
"syntax": "Packages/Text/Plain text.tmLanguage",
"tab_size": 3,
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 1,
"stack_multiselect": false,
"type": "text"
}
]
}
],
"incremental_find":
{
"height": 34.0
"height": 35.0
},
"input":
{
......@@ -381,7 +641,7 @@
"project": "camtron.sublime-project",
"replace":
{
"height": 64.0
"height": 86.0
},
"save_all_on_build": true,
"select_file":
......@@ -430,7 +690,7 @@
"show_minimap": true,
"show_open_files": true,
"show_tabs": true,
"side_bar_visible": true,
"side_bar_visible": false,
"side_bar_width": 396.0,
"status_bar_visible": true,
"template_settings":
......