diff --git a/.git-old/COMMIT_EDITMSG b/.git-old/COMMIT_EDITMSG deleted file mode 100644 index 0884a5b..0000000 --- a/.git-old/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -large refactor of data object and settings diff --git a/.git-old/FETCH_HEAD b/.git-old/FETCH_HEAD deleted file mode 100644 index 4a19f4e..0000000 --- a/.git-old/FETCH_HEAD +++ /dev/null @@ -1,3 +0,0 @@ -3d0aebbe9ccf0e1d14f9a160d4da77547a0e5640 branch 'master' of https://github.com/langolierz/r_e_c_u_r -e8d6d11a7c447027b3099632858c5ee17323d07c not-for-merge branch 'beta' of https://github.com/langolierz/r_e_c_u_r -e9eb6c1c9e0d446445216a8c75e12b77fb2ac0ba not-for-merge branch 'improve-video-player' of https://github.com/langolierz/r_e_c_u_r diff --git a/.git-old/HEAD b/.git-old/HEAD deleted file mode 100644 index cb089cd..0000000 --- a/.git-old/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/.git-old/ORIG_HEAD b/.git-old/ORIG_HEAD deleted file mode 100644 index d4c9c53..0000000 --- a/.git-old/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -f14097ef6012760bfda159183469c5c5826ab9ce diff --git a/.git-old/config b/.git-old/config deleted file mode 100644 index e7d60a3..0000000 --- a/.git-old/config +++ /dev/null @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - url = https://github.com/langolierz/r_e_c_u_r.git - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/.git-old/description b/.git-old/description deleted file mode 100644 index 498b267..0000000 --- a/.git-old/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/.git-old/hooks/applypatch-msg.sample b/.git-old/hooks/applypatch-msg.sample deleted file mode 100755 index a5d7b84..0000000 --- a/.git-old/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: diff --git a/.git-old/hooks/commit-msg.sample b/.git-old/hooks/commit-msg.sample deleted file mode 100755 index b58d118..0000000 --- a/.git-old/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff --git a/.git-old/hooks/post-update.sample b/.git-old/hooks/post-update.sample deleted file mode 100755 index ec17ec1..0000000 --- a/.git-old/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff --git a/.git-old/hooks/pre-applypatch.sample b/.git-old/hooks/pre-applypatch.sample deleted file mode 100755 index 4142082..0000000 --- a/.git-old/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: diff --git a/.git-old/hooks/pre-commit.sample b/.git-old/hooks/pre-commit.sample deleted file mode 100755 index 68d62d5..0000000 --- a/.git-old/hooks/pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff --git a/.git-old/hooks/pre-push.sample b/.git-old/hooks/pre-push.sample deleted file mode 100755 index 6187dbf..0000000 --- a/.git-old/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -z40=0000000000000000000000000000000000000000 - -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # New branch, examine all commits - range="$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Check for WIP commit - commit=`git rev-list -n 1 --grep '^WIP' "$range"` - if [ -n "$commit" ] - then - echo >&2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff --git a/.git-old/hooks/pre-rebase.sample b/.git-old/hooks/pre-rebase.sample deleted file mode 100755 index 33730ca..0000000 --- a/.git-old/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up-to-date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff --git a/.git-old/hooks/pre-receive.sample b/.git-old/hooks/pre-receive.sample deleted file mode 100755 index a1fd29e..0000000 --- a/.git-old/hooks/pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff --git a/.git-old/hooks/prepare-commit-msg.sample b/.git-old/hooks/prepare-commit-msg.sample deleted file mode 100755 index f093a02..0000000 --- a/.git-old/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first comments out the -# "Conflicts:" part of a merge commit. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -case "$2,$3" in - merge,) - /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; - -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$1" ;; - - *) ;; -esac - -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/.git-old/hooks/update.sample b/.git-old/hooks/update.sample deleted file mode 100755 index 80ba941..0000000 --- a/.git-old/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 " >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 diff --git a/.git-old/index b/.git-old/index deleted file mode 100644 index 0f16c65..0000000 Binary files a/.git-old/index and /dev/null differ diff --git a/.git-old/info/exclude b/.git-old/info/exclude deleted file mode 100644 index a5196d1..0000000 --- a/.git-old/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/.git-old/logs/HEAD b/.git-old/logs/HEAD deleted file mode 100644 index 7c16b17..0000000 Binary files a/.git-old/logs/HEAD and /dev/null differ diff --git a/.git-old/logs/refs/heads/master b/.git-old/logs/refs/heads/master deleted file mode 100644 index 82f1563..0000000 Binary files a/.git-old/logs/refs/heads/master and /dev/null differ diff --git a/.git-old/logs/refs/remotes/origin/HEAD b/.git-old/logs/refs/remotes/origin/HEAD deleted file mode 100644 index d9f86cc..0000000 --- a/.git-old/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 342e850ca9c5d26e50ed5a02a526651654b0ec17 pi 1520982973 +0000 clone: from https://github.com/langolierz/r_e_c_u_r.git diff --git a/.git-old/logs/refs/remotes/origin/beta b/.git-old/logs/refs/remotes/origin/beta deleted file mode 100644 index 83baff4..0000000 --- a/.git-old/logs/refs/remotes/origin/beta +++ /dev/null @@ -1 +0,0 @@ -0476e44bce8cdbf1a9708b5ff34135437da90481 e8d6d11a7c447027b3099632858c5ee17323d07c langolierz 1522795026 +0000 pull origin: fast-forward diff --git a/.git-old/logs/refs/remotes/origin/master b/.git-old/logs/refs/remotes/origin/master deleted file mode 100644 index 1332603..0000000 --- a/.git-old/logs/refs/remotes/origin/master +++ /dev/null @@ -1,16 +0,0 @@ -342e850ca9c5d26e50ed5a02a526651654b0ec17 84067c240ba672bc14f23cfd3d333609bd75bc3e langolierz 1520992811 +0000 pull: fast-forward -84067c240ba672bc14f23cfd3d333609bd75bc3e 1fb6ad1df4f05018454727db66ce71dfe2803841 langolierz 1520992845 +0000 update by push -1fb6ad1df4f05018454727db66ce71dfe2803841 cf80674faa427f9013fb3bbcaf4f8fb9f9285458 langolierz 1522795026 +0000 pull origin: fast-forward -cf80674faa427f9013fb3bbcaf4f8fb9f9285458 a81fb0691a98083231764b73619928eea1b0e140 langolierz 1522882707 +0000 update by push -a81fb0691a98083231764b73619928eea1b0e140 a28d4a2b3b6bf0003e3eefd47abdfbeffe4206eb langolierz 1523008654 +0000 pull origin: fast-forward -a28d4a2b3b6bf0003e3eefd47abdfbeffe4206eb c913ed4e22e8697cc37438f35527c5e55e601823 langolierz 1523008690 +0000 update by push -c913ed4e22e8697cc37438f35527c5e55e601823 c7ea947389fc03542be98c98f8ccd275f276489e langolierz 1524094361 +0000 pull origin: fast-forward -c7ea947389fc03542be98c98f8ccd275f276489e c66ce22a0d9a89d78246dc6045b9d3d038d35043 langolierz 1524094391 +0000 update by push -c66ce22a0d9a89d78246dc6045b9d3d038d35043 aaa0955c5cb1a98a75c119592e1e85f658aa89a4 langolierz 1524118351 +0000 update by push -aaa0955c5cb1a98a75c119592e1e85f658aa89a4 468219b4edc9bdd337f6d41263a71437ad6dcbc3 langolierz 1524183845 +0000 pull origin: fast-forward -468219b4edc9bdd337f6d41263a71437ad6dcbc3 1ff6d89b1f3ee993d5ada5d324ae2498c460e9c1 langolierz 1524183864 +0000 update by push -1ff6d89b1f3ee993d5ada5d324ae2498c460e9c1 d41647d41710015b22a2778225f8ecf23f27093f langolierz 1524185408 +0000 update by push -d41647d41710015b22a2778225f8ecf23f27093f 9bc4369cf2a39af07588cf9271a9be1916586c7d langolierz 1524196403 +0000 update by push -9bc4369cf2a39af07588cf9271a9be1916586c7d a7889b7cf411ca9690c278270196e39d0208e4c0 langolierz 1524199963 +0000 update by push -a7889b7cf411ca9690c278270196e39d0208e4c0 3d0aebbe9ccf0e1d14f9a160d4da77547a0e5640 langolierz 1524207314 +0000 pull origin: fast-forward -3d0aebbe9ccf0e1d14f9a160d4da77547a0e5640 e787b263fecd493ee73c86beb07768ac7962090d langolierz 1524207338 +0000 update by push diff --git a/.git-old/logs/refs/stash b/.git-old/logs/refs/stash deleted file mode 100644 index c4ff5c8..0000000 --- a/.git-old/logs/refs/stash +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 2c61e24a859d82c91a069a64dce79a5102acf299 langolierz 1520992852 +0000 WIP on master: 1fb6ad1 Merge branch 'master' of https://github.com/langolierz/r_e_c_u_r -2c61e24a859d82c91a069a64dce79a5102acf299 716939497baec281e1e63212b8b7baac08093527 langolierz 1522795033 +0000 WIP on master: 1fb6ad1 Merge branch 'master' of https://github.com/langolierz/r_e_c_u_r diff --git a/.git-old/objects/00/bbfea7913fd539a7a322c47c698c2670c739bb b/.git-old/objects/00/bbfea7913fd539a7a322c47c698c2670c739bb deleted file mode 100644 index 3cfbca8..0000000 Binary files a/.git-old/objects/00/bbfea7913fd539a7a322c47c698c2670c739bb and /dev/null differ diff --git a/.git-old/objects/00/d1172d0f568697b2619cde187ca35714370aa5 b/.git-old/objects/00/d1172d0f568697b2619cde187ca35714370aa5 deleted file mode 100644 index 36bc126..0000000 Binary files a/.git-old/objects/00/d1172d0f568697b2619cde187ca35714370aa5 and /dev/null differ diff --git a/.git-old/objects/01/b380fdbae3a0e5260deb88a675251d83329d50 b/.git-old/objects/01/b380fdbae3a0e5260deb88a675251d83329d50 deleted file mode 100644 index dbc0c92..0000000 Binary files a/.git-old/objects/01/b380fdbae3a0e5260deb88a675251d83329d50 and /dev/null differ diff --git a/.git-old/objects/03/6022c005dcf0a425c83b69f08331237440d98b b/.git-old/objects/03/6022c005dcf0a425c83b69f08331237440d98b deleted file mode 100644 index b3a3170..0000000 --- a/.git-old/objects/03/6022c005dcf0a425c83b69f08331237440d98b +++ /dev/null @@ -1,2 +0,0 @@ -x -0=).H6 *Fb<ӛw4|0|#9éU@QF$Z%/:u(02.zT`fdDH)jS`{ï;K7-}IHD8hX @ k+'-{. ~PO \ No newline at end of file diff --git a/.git-old/objects/03/b8dd9b1a6084a88e0912b1afa6943cedfa657f b/.git-old/objects/03/b8dd9b1a6084a88e0912b1afa6943cedfa657f deleted file mode 100644 index 1539547..0000000 Binary files a/.git-old/objects/03/b8dd9b1a6084a88e0912b1afa6943cedfa657f and /dev/null differ diff --git a/.git-old/objects/03/d802f9760aeda0180875d69fb33a80c4694507 b/.git-old/objects/03/d802f9760aeda0180875d69fb33a80c4694507 deleted file mode 100644 index 6eccb39..0000000 Binary files a/.git-old/objects/03/d802f9760aeda0180875d69fb33a80c4694507 and /dev/null differ diff --git a/.git-old/objects/04/02525109108b3259ef1959855509e7b59f3b2a b/.git-old/objects/04/02525109108b3259ef1959855509e7b59f3b2a deleted file mode 100644 index 7d73b9d..0000000 Binary files a/.git-old/objects/04/02525109108b3259ef1959855509e7b59f3b2a and /dev/null differ diff --git a/.git-old/objects/04/2b9a74fe4727b64007a729000e40e28da16c7c b/.git-old/objects/04/2b9a74fe4727b64007a729000e40e28da16c7c deleted file mode 100644 index f2585ee..0000000 Binary files a/.git-old/objects/04/2b9a74fe4727b64007a729000e40e28da16c7c and /dev/null differ diff --git a/.git-old/objects/04/361e9ac5c3d2974bcb0534bd9cca0e61b3a842 b/.git-old/objects/04/361e9ac5c3d2974bcb0534bd9cca0e61b3a842 deleted file mode 100644 index 14e2d06..0000000 --- a/.git-old/objects/04/361e9ac5c3d2974bcb0534bd9cca0e61b3a842 +++ /dev/null @@ -1,3 +0,0 @@ -x̱0agk91aqw\&#속?|.SgS{pag/ -xR:R@(/80[飁T_H6D/B -2EAJaIyh9Cc:=`cOr]m,~נP \ No newline at end of file diff --git a/.git-old/objects/04/eeb70d13e727490040dda99fa94c1aae2a6f9b b/.git-old/objects/04/eeb70d13e727490040dda99fa94c1aae2a6f9b deleted file mode 100644 index e5f0091..0000000 Binary files a/.git-old/objects/04/eeb70d13e727490040dda99fa94c1aae2a6f9b and /dev/null differ diff --git a/.git-old/objects/07/3eeef34f55c1f7dcbfb4588e6caa730a2c64ad b/.git-old/objects/07/3eeef34f55c1f7dcbfb4588e6caa730a2c64ad deleted file mode 100644 index 9751f81..0000000 Binary files a/.git-old/objects/07/3eeef34f55c1f7dcbfb4588e6caa730a2c64ad and /dev/null differ diff --git a/.git-old/objects/07/cd154ae66604d0d93049bf53a027fc08d6ab49 b/.git-old/objects/07/cd154ae66604d0d93049bf53a027fc08d6ab49 deleted file mode 100644 index 21ce20c..0000000 Binary files a/.git-old/objects/07/cd154ae66604d0d93049bf53a027fc08d6ab49 and /dev/null differ diff --git a/.git-old/objects/09/41b0d41fb21762ea13871188b14d9ebd717f32 b/.git-old/objects/09/41b0d41fb21762ea13871188b14d9ebd717f32 deleted file mode 100644 index 171dd7b..0000000 Binary files a/.git-old/objects/09/41b0d41fb21762ea13871188b14d9ebd717f32 and /dev/null differ diff --git a/.git-old/objects/09/768c633310274c7e4d646ca4c895affbbc9f12 b/.git-old/objects/09/768c633310274c7e4d646ca4c895affbbc9f12 deleted file mode 100644 index 2ffbed3..0000000 Binary files a/.git-old/objects/09/768c633310274c7e4d646ca4c895affbbc9f12 and /dev/null differ diff --git a/.git-old/objects/0d/3ec96dc6acccf68738939ae27cb12ad1816501 b/.git-old/objects/0d/3ec96dc6acccf68738939ae27cb12ad1816501 deleted file mode 100644 index bd8cfce..0000000 Binary files a/.git-old/objects/0d/3ec96dc6acccf68738939ae27cb12ad1816501 and /dev/null differ diff --git a/.git-old/objects/0e/2efefff382637165470b6a951583297d49471a b/.git-old/objects/0e/2efefff382637165470b6a951583297d49471a deleted file mode 100644 index dc37810..0000000 Binary files a/.git-old/objects/0e/2efefff382637165470b6a951583297d49471a and /dev/null differ diff --git a/.git-old/objects/0e/c5d09457fbc324b5e26224ee49170bf0ad1d7e b/.git-old/objects/0e/c5d09457fbc324b5e26224ee49170bf0ad1d7e deleted file mode 100644 index 5e97dfb..0000000 Binary files a/.git-old/objects/0e/c5d09457fbc324b5e26224ee49170bf0ad1d7e and /dev/null differ diff --git a/.git-old/objects/0f/1d633607ee6a63825041b45055c54cbb5877f2 b/.git-old/objects/0f/1d633607ee6a63825041b45055c54cbb5877f2 deleted file mode 100644 index b9f5e88..0000000 --- a/.git-old/objects/0f/1d633607ee6a63825041b45055c54cbb5877f2 +++ /dev/null @@ -1 +0,0 @@ -xj (uOf-{Md (j`g2 fGJa;rT@˂vop' oi5kUc;Ѵ [EFGPJ=9MUE}(]۞wCsK~OҟXYBM9q"rSiAD](h@񗳴Rl 0Cdu60H P&l843wUf-^޼uK%w \ No newline at end of file diff --git a/.git-old/objects/11/f670d87b51d1ff8e59dbc1ce9ae98110c905c3 b/.git-old/objects/11/f670d87b51d1ff8e59dbc1ce9ae98110c905c3 deleted file mode 100644 index 5ae6b91..0000000 Binary files a/.git-old/objects/11/f670d87b51d1ff8e59dbc1ce9ae98110c905c3 and /dev/null differ diff --git a/.git-old/objects/12/0e3be32b78a1c16770c4b03ab5ba07ff0c69d0 b/.git-old/objects/12/0e3be32b78a1c16770c4b03ab5ba07ff0c69d0 deleted file mode 100644 index 9c3400b..0000000 Binary files a/.git-old/objects/12/0e3be32b78a1c16770c4b03ab5ba07ff0c69d0 and /dev/null differ diff --git a/.git-old/objects/12/25cb17a289d03f31c6fa421ee64da9f0309916 b/.git-old/objects/12/25cb17a289d03f31c6fa421ee64da9f0309916 deleted file mode 100644 index e69de29..0000000 diff --git a/.git-old/objects/12/a822cdec3dcdcc21ecf7c231d67ba74018d213 b/.git-old/objects/12/a822cdec3dcdcc21ecf7c231d67ba74018d213 deleted file mode 100644 index 9c35deb..0000000 Binary files a/.git-old/objects/12/a822cdec3dcdcc21ecf7c231d67ba74018d213 and /dev/null differ diff --git a/.git-old/objects/13/abaeb47598e69f8018e32cd42cb15c0ca5baaf b/.git-old/objects/13/abaeb47598e69f8018e32cd42cb15c0ca5baaf deleted file mode 100644 index 5cddb8d..0000000 Binary files a/.git-old/objects/13/abaeb47598e69f8018e32cd42cb15c0ca5baaf and /dev/null differ diff --git a/.git-old/objects/13/c053ff5dd47c21fcd65fe069df934bc9097545 b/.git-old/objects/13/c053ff5dd47c21fcd65fe069df934bc9097545 deleted file mode 100644 index 3e1086e..0000000 --- a/.git-old/objects/13/c053ff5dd47c21fcd65fe069df934bc9097545 +++ /dev/null @@ -1,2 +0,0 @@ -xR -0SBMcCYlIJ"ЋP~ͬz^,TS -8$>9? 8$5>7?%Ln×{f5;_N0 %p Ҕý&w=i"qL\S0@z亊y]6}t$ɦW \ No newline at end of file diff --git a/.git-old/objects/1e/8d560d2cf2ea596af267d7cecbece0cb1bc29b b/.git-old/objects/1e/8d560d2cf2ea596af267d7cecbece0cb1bc29b deleted file mode 100644 index 86f67b0..0000000 Binary files a/.git-old/objects/1e/8d560d2cf2ea596af267d7cecbece0cb1bc29b and /dev/null differ diff --git a/.git-old/objects/1f/5070a155ef89e0c9964679151d2c1dba969a46 b/.git-old/objects/1f/5070a155ef89e0c9964679151d2c1dba969a46 deleted file mode 100644 index 8ab9686..0000000 Binary files a/.git-old/objects/1f/5070a155ef89e0c9964679151d2c1dba969a46 and /dev/null differ diff --git a/.git-old/objects/1f/6b6db0ecab15c2932842251903ef3284f8228a b/.git-old/objects/1f/6b6db0ecab15c2932842251903ef3284f8228a deleted file mode 100644 index 31a8ba6..0000000 Binary files a/.git-old/objects/1f/6b6db0ecab15c2932842251903ef3284f8228a and /dev/null differ diff --git a/.git-old/objects/1f/b6ad1df4f05018454727db66ce71dfe2803841 b/.git-old/objects/1f/b6ad1df4f05018454727db66ce71dfe2803841 deleted file mode 100644 index 56655e0..0000000 --- a/.git-old/objects/1f/b6ad1df4f05018454727db66ce71dfe2803841 +++ /dev/null @@ -1,2 +0,0 @@ -xO9n0 LW"@LZI^A>7$%Vn8E}X\ ax%g4,+ރgp(.RtQ:͝KުI !*[,' .z!u>:Aс(j݀CDD:I*JN{1 o̹|'W7c]Z -4|\l𦓹8.fTqkq!P[k2h \ No newline at end of file diff --git a/.git-old/objects/1f/b7703cb1468936a2077cd547849082a41771c5 b/.git-old/objects/1f/b7703cb1468936a2077cd547849082a41771c5 deleted file mode 100644 index 9d4446e..0000000 Binary files a/.git-old/objects/1f/b7703cb1468936a2077cd547849082a41771c5 and /dev/null differ diff --git a/.git-old/objects/1f/f6d89b1f3ee993d5ada5d324ae2498c460e9c1 b/.git-old/objects/1f/f6d89b1f3ee993d5ada5d324ae2498c460e9c1 deleted file mode 100644 index 70c0f46..0000000 --- a/.git-old/objects/1f/f6d89b1f3ee993d5ada5d324ae2498c460e9c1 +++ /dev/null @@ -1,3 +0,0 @@ -xOn0쯸-CN'rP~6GK>Pd/' ȸ\UVblHHM$Έ* [T*"3zLtl1NkL ~m>hI)1w&MʲHsM1DnQq_f)|q (M6'S='UW2 -8e SmǹNGݾ -e!P' g \ No newline at end of file diff --git a/.git-old/objects/20/1d8125024dcd4c3834ae00242eb654e6d14de6 b/.git-old/objects/20/1d8125024dcd4c3834ae00242eb654e6d14de6 deleted file mode 100644 index 6c051cb..0000000 --- a/.git-old/objects/20/1d8125024dcd4c3834ae00242eb654e6d14de6 +++ /dev/null @@ -1,3 +0,0 @@ -xPˊ0۳b (ee♤'~{uBBB{(F/ MWLJ(%8 -.)qbc@>()aL- I8iǸ7v,' -ifu-'Tcqc20tέA@~Vtd<ǣdYf \ No newline at end of file diff --git a/.git-old/objects/21/2579b2c1f8f1ef2331103348469ade15e67646 b/.git-old/objects/21/2579b2c1f8f1ef2331103348469ade15e67646 deleted file mode 100644 index 9ecaea3..0000000 Binary files a/.git-old/objects/21/2579b2c1f8f1ef2331103348469ade15e67646 and /dev/null differ diff --git a/.git-old/objects/21/27b4755228e143b76a79dd4e4f8e03a40549f0 b/.git-old/objects/21/27b4755228e143b76a79dd4e4f8e03a40549f0 deleted file mode 100644 index e6dec8c..0000000 Binary files a/.git-old/objects/21/27b4755228e143b76a79dd4e4f8e03a40549f0 and /dev/null differ diff --git a/.git-old/objects/21/50d03e229d2768f3f21c8193156f62b28b37e0 b/.git-old/objects/21/50d03e229d2768f3f21c8193156f62b28b37e0 deleted file mode 100644 index 8e21048..0000000 Binary files a/.git-old/objects/21/50d03e229d2768f3f21c8193156f62b28b37e0 and /dev/null differ diff --git a/.git-old/objects/21/65bbadbc48fc889d551c457bbca5222ce38718 b/.git-old/objects/21/65bbadbc48fc889d551c457bbca5222ce38718 deleted file mode 100644 index 419e205..0000000 Binary files a/.git-old/objects/21/65bbadbc48fc889d551c457bbca5222ce38718 and /dev/null differ diff --git a/.git-old/objects/21/67a28a16bda608c4fcf74d6b4b50b1adf839c9 b/.git-old/objects/21/67a28a16bda608c4fcf74d6b4b50b1adf839c9 deleted file mode 100644 index a7981d3..0000000 --- a/.git-old/objects/21/67a28a16bda608c4fcf74d6b4b50b1adf839c9 +++ /dev/null @@ -1 +0,0 @@ -x1 0`J[dpqiL 檈ێ݊n{CA}2{JNcX %$B\`{I+Puicgdg1tU ˳vh|A ٯ-xwVwh/.~ \ No newline at end of file diff --git a/.git-old/objects/22/0ed67a47d41a0588908904c70b9681a11e8aee b/.git-old/objects/22/0ed67a47d41a0588908904c70b9681a11e8aee deleted file mode 100644 index 2045899..0000000 Binary files a/.git-old/objects/22/0ed67a47d41a0588908904c70b9681a11e8aee and /dev/null differ diff --git a/.git-old/objects/22/534000debabbb0e39452670dca0367d47f94bc b/.git-old/objects/22/534000debabbb0e39452670dca0367d47f94bc deleted file mode 100644 index 8983091..0000000 --- a/.git-old/objects/22/534000debabbb0e39452670dca0367d47f94bc +++ /dev/null @@ -1,3 +0,0 @@ -x_o0>3M'doMnjMT]9斠&YUאvZ6ސ{=x:ƓwAh¤0Jr`*R 1ŧ}M40FsT(/6#w)b0LrY*(apܮ! ᴡۯ?ۺ\J5*ȑL -( rU^|:Ո[XSD(8}@uf&^gz2/}Bٙx7JqEL K"3ﺷȟ2;ܚy=)x` \ No newline at end of file diff --git a/.git-old/objects/23/661f24d3a9e3f632f1da3dd938a048779a7f2e b/.git-old/objects/23/661f24d3a9e3f632f1da3dd938a048779a7f2e deleted file mode 100644 index 6fe502c..0000000 Binary files a/.git-old/objects/23/661f24d3a9e3f632f1da3dd938a048779a7f2e and /dev/null differ diff --git a/.git-old/objects/24/718b22dde558374efe7c26fb32c72691a94db6 b/.git-old/objects/24/718b22dde558374efe7c26fb32c72691a94db6 deleted file mode 100644 index cd914e2..0000000 Binary files a/.git-old/objects/24/718b22dde558374efe7c26fb32c72691a94db6 and /dev/null differ diff --git a/.git-old/objects/25/3e9cbc26b6bcbb63750edf35cd33e7ef32ecdc b/.git-old/objects/25/3e9cbc26b6bcbb63750edf35cd33e7ef32ecdc deleted file mode 100644 index a615a42..0000000 Binary files a/.git-old/objects/25/3e9cbc26b6bcbb63750edf35cd33e7ef32ecdc and /dev/null differ diff --git a/.git-old/objects/27/2816e3fc5e9929dda406881697f8f589947535 b/.git-old/objects/27/2816e3fc5e9929dda406881697f8f589947535 deleted file mode 100644 index 6c39191..0000000 Binary files a/.git-old/objects/27/2816e3fc5e9929dda406881697f8f589947535 and /dev/null differ diff --git a/.git-old/objects/28/44ed0f6694e2d859b1f38219f41d2338f0b617 b/.git-old/objects/28/44ed0f6694e2d859b1f38219f41d2338f0b617 deleted file mode 100644 index e6aac2f..0000000 Binary files a/.git-old/objects/28/44ed0f6694e2d859b1f38219f41d2338f0b617 and /dev/null differ diff --git a/.git-old/objects/28/851bb346f78a40097e6ab765a51c7642602b60 b/.git-old/objects/28/851bb346f78a40097e6ab765a51c7642602b60 deleted file mode 100644 index 6ffa844..0000000 --- a/.git-old/objects/28/851bb346f78a40097e6ab765a51c7642602b60 +++ /dev/null @@ -1,2 +0,0 @@ -xKOR07`VON,SRPMML//LI//ɏ/IK/.K-0QQPJKj52KJ`Լ D( -ӜZTwLF1`Ka*1>b!O \ No newline at end of file diff --git a/.git-old/objects/2a/0a79b8781383ca868e3e0678a70825fc52dda7 b/.git-old/objects/2a/0a79b8781383ca868e3e0678a70825fc52dda7 deleted file mode 100644 index 013e04f..0000000 Binary files a/.git-old/objects/2a/0a79b8781383ca868e3e0678a70825fc52dda7 and /dev/null differ diff --git a/.git-old/objects/2c/61e24a859d82c91a069a64dce79a5102acf299 b/.git-old/objects/2c/61e24a859d82c91a069a64dce79a5102acf299 deleted file mode 100644 index ca3db7f..0000000 --- a/.git-old/objects/2c/61e24a859d82c91a069a64dce79a5102acf299 +++ /dev/null @@ -1,2 +0,0 @@ -xj0S)"ײ#MHJ+`[Nnqj] y] -ڊZ!TlDL$YKl296W,U:2&78"u]`wȬz{#ykDXw(%.:O]){&(R uƼ\%U{[PJu|B`|\F* N rܶ\~g[°ڌqz \ No newline at end of file diff --git a/.git-old/objects/2c/7b1f4f03c256b7fd5c8ff967fcd9d07639c209 b/.git-old/objects/2c/7b1f4f03c256b7fd5c8ff967fcd9d07639c209 deleted file mode 100644 index 394c6a5..0000000 Binary files a/.git-old/objects/2c/7b1f4f03c256b7fd5c8ff967fcd9d07639c209 and /dev/null differ diff --git a/.git-old/objects/2c/e7a1bdbe1edeed97f9e1b09ee4cd11e8a4334b b/.git-old/objects/2c/e7a1bdbe1edeed97f9e1b09ee4cd11e8a4334b deleted file mode 100644 index 19773a1..0000000 Binary files a/.git-old/objects/2c/e7a1bdbe1edeed97f9e1b09ee4cd11e8a4334b and /dev/null differ diff --git a/.git-old/objects/2d/bde97c88a43be1f4417ef13a5ac5ea7b3ce301 b/.git-old/objects/2d/bde97c88a43be1f4417ef13a5ac5ea7b3ce301 deleted file mode 100644 index fafeaaa..0000000 Binary files a/.git-old/objects/2d/bde97c88a43be1f4417ef13a5ac5ea7b3ce301 and /dev/null differ diff --git a/.git-old/objects/2d/f918bcb328633a30f1f6e64ec223a743de7e0f b/.git-old/objects/2d/f918bcb328633a30f1f6e64ec223a743de7e0f deleted file mode 100644 index 9da892c..0000000 Binary files a/.git-old/objects/2d/f918bcb328633a30f1f6e64ec223a743de7e0f and /dev/null differ diff --git a/.git-old/objects/2e/2fed165d1b4ad3cbbd4ded877112e7af7aa076 b/.git-old/objects/2e/2fed165d1b4ad3cbbd4ded877112e7af7aa076 deleted file mode 100644 index 64fb8ae..0000000 Binary files a/.git-old/objects/2e/2fed165d1b4ad3cbbd4ded877112e7af7aa076 and /dev/null differ diff --git a/.git-old/objects/2e/81b7d13a844ab11571a90994940e46e60a5d7a b/.git-old/objects/2e/81b7d13a844ab11571a90994940e46e60a5d7a deleted file mode 100644 index 4e68e15..0000000 Binary files a/.git-old/objects/2e/81b7d13a844ab11571a90994940e46e60a5d7a and /dev/null differ diff --git a/.git-old/objects/2f/5c50bae25ab5973091f2bd7a96f2edd9be7ca5 b/.git-old/objects/2f/5c50bae25ab5973091f2bd7a96f2edd9be7ca5 deleted file mode 100644 index b148b2c..0000000 Binary files a/.git-old/objects/2f/5c50bae25ab5973091f2bd7a96f2edd9be7ca5 and /dev/null differ diff --git a/.git-old/objects/30/7521cea6dfb9ae2481c6aa5b9469438aaa7d5e b/.git-old/objects/30/7521cea6dfb9ae2481c6aa5b9469438aaa7d5e deleted file mode 100644 index d5fba7a..0000000 Binary files a/.git-old/objects/30/7521cea6dfb9ae2481c6aa5b9469438aaa7d5e and /dev/null differ diff --git a/.git-old/objects/31/04ae03dce7e7f9aeed2c24dfe5069708ece003 b/.git-old/objects/31/04ae03dce7e7f9aeed2c24dfe5069708ece003 deleted file mode 100644 index fde6bd0..0000000 Binary files a/.git-old/objects/31/04ae03dce7e7f9aeed2c24dfe5069708ece003 and /dev/null differ diff --git a/.git-old/objects/32/61d687fa3ebfcd476b51cde2e0c9aa700fe6a0 b/.git-old/objects/32/61d687fa3ebfcd476b51cde2e0c9aa700fe6a0 deleted file mode 100644 index ba2ddcb..0000000 Binary files a/.git-old/objects/32/61d687fa3ebfcd476b51cde2e0c9aa700fe6a0 and /dev/null differ diff --git a/.git-old/objects/32/74df0a6685f1a3a220b43f39b0e9123fe3c029 b/.git-old/objects/32/74df0a6685f1a3a220b43f39b0e9123fe3c029 deleted file mode 100644 index 790dacc..0000000 Binary files a/.git-old/objects/32/74df0a6685f1a3a220b43f39b0e9123fe3c029 and /dev/null differ diff --git a/.git-old/objects/33/79d670d29d80b423de984f4359bcc19ea080db b/.git-old/objects/33/79d670d29d80b423de984f4359bcc19ea080db deleted file mode 100644 index 4f8921e..0000000 Binary files a/.git-old/objects/33/79d670d29d80b423de984f4359bcc19ea080db and /dev/null differ diff --git a/.git-old/objects/34/ae681935011253a08d5401b35fe013f0068b0f b/.git-old/objects/34/ae681935011253a08d5401b35fe013f0068b0f deleted file mode 100644 index f9815b1..0000000 Binary files a/.git-old/objects/34/ae681935011253a08d5401b35fe013f0068b0f and /dev/null differ diff --git a/.git-old/objects/34/f480055e7c5e404d6d452a1d4b34acbe65a755 b/.git-old/objects/34/f480055e7c5e404d6d452a1d4b34acbe65a755 deleted file mode 100644 index 3b432b8..0000000 Binary files a/.git-old/objects/34/f480055e7c5e404d6d452a1d4b34acbe65a755 and /dev/null differ diff --git a/.git-old/objects/35/bb90e050a069ae132d331deb90a586f65c25f5 b/.git-old/objects/35/bb90e050a069ae132d331deb90a586f65c25f5 deleted file mode 100644 index 224c92e..0000000 Binary files a/.git-old/objects/35/bb90e050a069ae132d331deb90a586f65c25f5 and /dev/null differ diff --git a/.git-old/objects/36/cfc6c7395cf00bdfe15be05dbbab9a5355c51e b/.git-old/objects/36/cfc6c7395cf00bdfe15be05dbbab9a5355c51e deleted file mode 100644 index 0f06d69..0000000 Binary files a/.git-old/objects/36/cfc6c7395cf00bdfe15be05dbbab9a5355c51e and /dev/null differ diff --git a/.git-old/objects/37/4ad67438c30c76752fac56b350123b7e6d9eb0 b/.git-old/objects/37/4ad67438c30c76752fac56b350123b7e6d9eb0 deleted file mode 100644 index e9642a7..0000000 Binary files a/.git-old/objects/37/4ad67438c30c76752fac56b350123b7e6d9eb0 and /dev/null differ diff --git a/.git-old/objects/37/f4f26e15e47ad9760fbceb7e6952ede3814c93 b/.git-old/objects/37/f4f26e15e47ad9760fbceb7e6952ede3814c93 deleted file mode 100644 index 33540bd..0000000 Binary files a/.git-old/objects/37/f4f26e15e47ad9760fbceb7e6952ede3814c93 and /dev/null differ diff --git a/.git-old/objects/38/ff25f1a7435de58ef979368b14c6aa5b9b759c b/.git-old/objects/38/ff25f1a7435de58ef979368b14c6aa5b9b759c deleted file mode 100644 index 2f521ef..0000000 Binary files a/.git-old/objects/38/ff25f1a7435de58ef979368b14c6aa5b9b759c and /dev/null differ diff --git a/.git-old/objects/39/823e8c270de609fd2bb43d8603071a7ec1e400 b/.git-old/objects/39/823e8c270de609fd2bb43d8603071a7ec1e400 deleted file mode 100644 index c284a5b..0000000 Binary files a/.git-old/objects/39/823e8c270de609fd2bb43d8603071a7ec1e400 and /dev/null differ diff --git a/.git-old/objects/3a/7bf5f050b25a8325e857e3c4288925f96d5978 b/.git-old/objects/3a/7bf5f050b25a8325e857e3c4288925f96d5978 deleted file mode 100644 index 83b94d8..0000000 Binary files a/.git-old/objects/3a/7bf5f050b25a8325e857e3c4288925f96d5978 and /dev/null differ diff --git a/.git-old/objects/3a/f260c4b54827d958ad9495696e70483519cccc b/.git-old/objects/3a/f260c4b54827d958ad9495696e70483519cccc deleted file mode 100644 index 5c99702..0000000 Binary files a/.git-old/objects/3a/f260c4b54827d958ad9495696e70483519cccc and /dev/null differ diff --git a/.git-old/objects/3c/9e17c6ca01887c07526c0ad8f32bc6a7e4ab08 b/.git-old/objects/3c/9e17c6ca01887c07526c0ad8f32bc6a7e4ab08 deleted file mode 100644 index 7b8c336..0000000 Binary files a/.git-old/objects/3c/9e17c6ca01887c07526c0ad8f32bc6a7e4ab08 and /dev/null differ diff --git a/.git-old/objects/3c/ce0de7a853d0a46546733c50f27e575efbf7b6 b/.git-old/objects/3c/ce0de7a853d0a46546733c50f27e575efbf7b6 deleted file mode 100644 index 68d2134..0000000 --- a/.git-old/objects/3c/ce0de7a853d0a46546733c50f27e575efbf7b6 +++ /dev/null @@ -1,2 +0,0 @@ -xuͯ@Ż毘=s7"(u 0 -(__.i朜&2g`*_XK)HaiBeD0c)iJf!0b@&LUD(LaT`*(@QI ȝo-(H݊#x{f%ɋV~"kC +R_/2+g{ޫ[K|3`Ӳ]YmE`g91FmvIv狼yH#,luWߛR+mRN65+`_N[ͼ{bOc反g²_EApX類d_)f 1W}=l gEփgy9 bt^d<Ղ.͕qp.9PE@t'a^xwyGSC LOI[.K,$v y5}`zRVP{(HgW~BqM,u!9,/l &uB^ԄQ^юUV&?r \ No newline at end of file diff --git a/.git-old/objects/3c/df08519bb20542b4e723f8601a92627822b3f1 b/.git-old/objects/3c/df08519bb20542b4e723f8601a92627822b3f1 deleted file mode 100644 index 17d3fa9..0000000 Binary files a/.git-old/objects/3c/df08519bb20542b4e723f8601a92627822b3f1 and /dev/null differ diff --git a/.git-old/objects/3d/0aebbe9ccf0e1d14f9a160d4da77547a0e5640 b/.git-old/objects/3d/0aebbe9ccf0e1d14f9a160d4da77547a0e5640 deleted file mode 100644 index f118cd2..0000000 Binary files a/.git-old/objects/3d/0aebbe9ccf0e1d14f9a160d4da77547a0e5640 and /dev/null differ diff --git a/.git-old/objects/3e/0b04604693f2d8d793b31d71cbccc6e66b24c9 b/.git-old/objects/3e/0b04604693f2d8d793b31d71cbccc6e66b24c9 deleted file mode 100644 index 409e4b6..0000000 Binary files a/.git-old/objects/3e/0b04604693f2d8d793b31d71cbccc6e66b24c9 and /dev/null differ diff --git a/.git-old/objects/3e/621ea70bc5dcaebc2fd1191130a8449840d984 b/.git-old/objects/3e/621ea70bc5dcaebc2fd1191130a8449840d984 deleted file mode 100644 index fb5105c..0000000 --- a/.git-old/objects/3e/621ea70bc5dcaebc2fd1191130a8449840d984 +++ /dev/null @@ -1,2 +0,0 @@ -x -0 }Md"B5SD|wWPA/Imf|R޸Nj[(6gc >+}J\  i~L~LEtglp:C@M϶xlKc dx1$P&+@rJ; {6ï/},2 \ No newline at end of file diff --git a/.git-old/objects/40/3f2e9b3ae1ed59ee0858d08661e6bafc13e81d b/.git-old/objects/40/3f2e9b3ae1ed59ee0858d08661e6bafc13e81d deleted file mode 100644 index d70e7bc..0000000 Binary files a/.git-old/objects/40/3f2e9b3ae1ed59ee0858d08661e6bafc13e81d and /dev/null differ diff --git a/.git-old/objects/40/692fe0f39b9aed84a9dc427c0692db8ee3b917 b/.git-old/objects/40/692fe0f39b9aed84a9dc427c0692db8ee3b917 deleted file mode 100644 index 5265cf8..0000000 Binary files a/.git-old/objects/40/692fe0f39b9aed84a9dc427c0692db8ee3b917 and /dev/null differ diff --git a/.git-old/objects/41/1caecd4efc7e5517a8ce2bf5436538e45e7aea b/.git-old/objects/41/1caecd4efc7e5517a8ce2bf5436538e45e7aea deleted file mode 100644 index a521117..0000000 Binary files a/.git-old/objects/41/1caecd4efc7e5517a8ce2bf5436538e45e7aea and /dev/null differ diff --git a/.git-old/objects/42/8f5cd78f4c783da226f6099a168714669e624a b/.git-old/objects/42/8f5cd78f4c783da226f6099a168714669e624a deleted file mode 100644 index c474ad4..0000000 Binary files a/.git-old/objects/42/8f5cd78f4c783da226f6099a168714669e624a and /dev/null differ diff --git a/.git-old/objects/43/287b934333218d34d5bd097b471012ac9f380c b/.git-old/objects/43/287b934333218d34d5bd097b471012ac9f380c deleted file mode 100644 index 9aed801..0000000 Binary files a/.git-old/objects/43/287b934333218d34d5bd097b471012ac9f380c and /dev/null differ diff --git a/.git-old/objects/43/de347ad3d2988b4ebb8b6d80b302139599edef b/.git-old/objects/43/de347ad3d2988b4ebb8b6d80b302139599edef deleted file mode 100644 index 81cfab9..0000000 Binary files a/.git-old/objects/43/de347ad3d2988b4ebb8b6d80b302139599edef and /dev/null differ diff --git a/.git-old/objects/43/fb2797d681ef096824efc4a32ea79ba5e87919 b/.git-old/objects/43/fb2797d681ef096824efc4a32ea79ba5e87919 deleted file mode 100644 index db08798..0000000 Binary files a/.git-old/objects/43/fb2797d681ef096824efc4a32ea79ba5e87919 and /dev/null differ diff --git a/.git-old/objects/44/9a04f648cf0caf2c6086bd0c4e633a915c9962 b/.git-old/objects/44/9a04f648cf0caf2c6086bd0c4e633a915c9962 deleted file mode 100644 index 752c41c..0000000 Binary files a/.git-old/objects/44/9a04f648cf0caf2c6086bd0c4e633a915c9962 and /dev/null differ diff --git a/.git-old/objects/45/d977c8bf829d073721772702fa73beb393a369 b/.git-old/objects/45/d977c8bf829d073721772702fa73beb393a369 deleted file mode 100644 index c270153..0000000 Binary files a/.git-old/objects/45/d977c8bf829d073721772702fa73beb393a369 and /dev/null differ diff --git a/.git-old/objects/45/ec89dd7a305293195e6892cd21b51cb089adcd b/.git-old/objects/45/ec89dd7a305293195e6892cd21b51cb089adcd deleted file mode 100644 index ecbe6b9..0000000 Binary files a/.git-old/objects/45/ec89dd7a305293195e6892cd21b51cb089adcd and /dev/null differ diff --git a/.git-old/objects/46/33d410d80503167b51760b255b682cdcfd8f01 b/.git-old/objects/46/33d410d80503167b51760b255b682cdcfd8f01 deleted file mode 100644 index 2303236..0000000 Binary files a/.git-old/objects/46/33d410d80503167b51760b255b682cdcfd8f01 and /dev/null differ diff --git a/.git-old/objects/46/8219b4edc9bdd337f6d41263a71437ad6dcbc3 b/.git-old/objects/46/8219b4edc9bdd337f6d41263a71437ad6dcbc3 deleted file mode 100644 index d2b629e..0000000 Binary files a/.git-old/objects/46/8219b4edc9bdd337f6d41263a71437ad6dcbc3 and /dev/null differ diff --git a/.git-old/objects/48/36e4754bbd55c33c630477c4d5d2605ced188c b/.git-old/objects/48/36e4754bbd55c33c630477c4d5d2605ced188c deleted file mode 100644 index 94f637a..0000000 Binary files a/.git-old/objects/48/36e4754bbd55c33c630477c4d5d2605ced188c and /dev/null differ diff --git a/.git-old/objects/48/7b49774a135799342dbfc67a8826ba00a4db8f b/.git-old/objects/48/7b49774a135799342dbfc67a8826ba00a4db8f deleted file mode 100644 index 118e12a..0000000 Binary files a/.git-old/objects/48/7b49774a135799342dbfc67a8826ba00a4db8f and /dev/null differ diff --git a/.git-old/objects/49/552a1f349c4aa0e099cb23e8f5b78deec7797f b/.git-old/objects/49/552a1f349c4aa0e099cb23e8f5b78deec7797f deleted file mode 100644 index 0cd77c9..0000000 Binary files a/.git-old/objects/49/552a1f349c4aa0e099cb23e8f5b78deec7797f and /dev/null differ diff --git a/.git-old/objects/4a/6965205a036d4e0d62e5b0f156150214532b00 b/.git-old/objects/4a/6965205a036d4e0d62e5b0f156150214532b00 deleted file mode 100644 index 0344315..0000000 Binary files a/.git-old/objects/4a/6965205a036d4e0d62e5b0f156150214532b00 and /dev/null differ diff --git a/.git-old/objects/4a/9ddeb33f9c8b9102963f7c1130c2f6b3ef558b b/.git-old/objects/4a/9ddeb33f9c8b9102963f7c1130c2f6b3ef558b deleted file mode 100644 index 9378a51..0000000 Binary files a/.git-old/objects/4a/9ddeb33f9c8b9102963f7c1130c2f6b3ef558b and /dev/null differ diff --git a/.git-old/objects/4b/006dd0b6bc3b440d1bb5b7222e7896add4abcd b/.git-old/objects/4b/006dd0b6bc3b440d1bb5b7222e7896add4abcd deleted file mode 100644 index 4ec4db5..0000000 Binary files a/.git-old/objects/4b/006dd0b6bc3b440d1bb5b7222e7896add4abcd and /dev/null differ diff --git a/.git-old/objects/4c/41dfa5369a6ceb901f7b469f2941cd45c17281 b/.git-old/objects/4c/41dfa5369a6ceb901f7b469f2941cd45c17281 deleted file mode 100644 index 1bed3d6..0000000 Binary files a/.git-old/objects/4c/41dfa5369a6ceb901f7b469f2941cd45c17281 and /dev/null differ diff --git a/.git-old/objects/4c/85de94d69210b409dea4d973785da8f848a7ae b/.git-old/objects/4c/85de94d69210b409dea4d973785da8f848a7ae deleted file mode 100644 index aad8bbb..0000000 Binary files a/.git-old/objects/4c/85de94d69210b409dea4d973785da8f848a7ae and /dev/null differ diff --git a/.git-old/objects/4c/97eb8a838c5780283c1ae4dffa5633b176ab33 b/.git-old/objects/4c/97eb8a838c5780283c1ae4dffa5633b176ab33 deleted file mode 100644 index b13c9ae..0000000 Binary files a/.git-old/objects/4c/97eb8a838c5780283c1ae4dffa5633b176ab33 and /dev/null differ diff --git a/.git-old/objects/4d/3c0659b8b5f0505368a8edc4e84a178775523b b/.git-old/objects/4d/3c0659b8b5f0505368a8edc4e84a178775523b deleted file mode 100644 index 41981fc..0000000 Binary files a/.git-old/objects/4d/3c0659b8b5f0505368a8edc4e84a178775523b and /dev/null differ diff --git a/.git-old/objects/4d/72552983e6d946b6fb79829e7f0a4a94cc4f9b b/.git-old/objects/4d/72552983e6d946b6fb79829e7f0a4a94cc4f9b deleted file mode 100644 index 2773646..0000000 Binary files a/.git-old/objects/4d/72552983e6d946b6fb79829e7f0a4a94cc4f9b and /dev/null differ diff --git a/.git-old/objects/4e/185caa5b0fd314572e1048b197d4d75f2be4d4 b/.git-old/objects/4e/185caa5b0fd314572e1048b197d4d75f2be4d4 deleted file mode 100644 index 07655e9..0000000 Binary files a/.git-old/objects/4e/185caa5b0fd314572e1048b197d4d75f2be4d4 and /dev/null differ diff --git a/.git-old/objects/4f/120c28b17faa563015af179094ad76177bf9b6 b/.git-old/objects/4f/120c28b17faa563015af179094ad76177bf9b6 deleted file mode 100644 index 9ab807b..0000000 Binary files a/.git-old/objects/4f/120c28b17faa563015af179094ad76177bf9b6 and /dev/null differ diff --git a/.git-old/objects/4f/60fbffe0f506e2e85f183cae3a02432c2eabac b/.git-old/objects/4f/60fbffe0f506e2e85f183cae3a02432c2eabac deleted file mode 100644 index 027ec86..0000000 Binary files a/.git-old/objects/4f/60fbffe0f506e2e85f183cae3a02432c2eabac and /dev/null differ diff --git a/.git-old/objects/51/aa3c064917ac615051501a9cf687990abb7e44 b/.git-old/objects/51/aa3c064917ac615051501a9cf687990abb7e44 deleted file mode 100644 index e8cf97c..0000000 Binary files a/.git-old/objects/51/aa3c064917ac615051501a9cf687990abb7e44 and /dev/null differ diff --git a/.git-old/objects/53/e06ebe14626fdefc153d954e6653e7e6908b7b b/.git-old/objects/53/e06ebe14626fdefc153d954e6653e7e6908b7b deleted file mode 100644 index 73d7950..0000000 Binary files a/.git-old/objects/53/e06ebe14626fdefc153d954e6653e7e6908b7b and /dev/null differ diff --git a/.git-old/objects/54/067e36a11e56d79b9a7c3a97b2489eba9d42b2 b/.git-old/objects/54/067e36a11e56d79b9a7c3a97b2489eba9d42b2 deleted file mode 100644 index 92ce3b0..0000000 --- a/.git-old/objects/54/067e36a11e56d79b9a7c3a97b2489eba9d42b2 +++ /dev/null @@ -1,3 +0,0 @@ -xj E+fFF(?ogk);\rSD`xcDh&>!W);Ze< -vJn BTk.H:㑤 ϶ -;>z`_|9@hYZ-c f){߸ՕU~o{akvÚva:ԅKecz \ No newline at end of file diff --git a/.git-old/objects/54/60df6dcc82b32aedcc73cccedf6bca00776a8d b/.git-old/objects/54/60df6dcc82b32aedcc73cccedf6bca00776a8d deleted file mode 100644 index 7866802..0000000 Binary files a/.git-old/objects/54/60df6dcc82b32aedcc73cccedf6bca00776a8d and /dev/null differ diff --git a/.git-old/objects/54/99809e079fc405f9766be8e9ef5b0da895b4b3 b/.git-old/objects/54/99809e079fc405f9766be8e9ef5b0da895b4b3 deleted file mode 100644 index 6cbb31f..0000000 Binary files a/.git-old/objects/54/99809e079fc405f9766be8e9ef5b0da895b4b3 and /dev/null differ diff --git a/.git-old/objects/55/23951664348f9e53781c07e2f479b839ea9dbe b/.git-old/objects/55/23951664348f9e53781c07e2f479b839ea9dbe deleted file mode 100644 index 90e8df7..0000000 Binary files a/.git-old/objects/55/23951664348f9e53781c07e2f479b839ea9dbe and /dev/null differ diff --git a/.git-old/objects/55/493acba770a839110abd3782cfe15e534eed95 b/.git-old/objects/55/493acba770a839110abd3782cfe15e534eed95 deleted file mode 100644 index 1f6ca0f..0000000 Binary files a/.git-old/objects/55/493acba770a839110abd3782cfe15e534eed95 and /dev/null differ diff --git a/.git-old/objects/55/be7e5ef88bdf887831dee769aadbc972c84e76 b/.git-old/objects/55/be7e5ef88bdf887831dee769aadbc972c84e76 deleted file mode 100644 index 4864845..0000000 --- a/.git-old/objects/55/be7e5ef88bdf887831dee769aadbc972c84e76 +++ /dev/null @@ -1,2 +0,0 @@ -x -0EN7".vKyI0$/&HMp{i^u/Ďb@;*B;-32 4GlJ,+y(էpncdk0ef~ñ]I^> + S$WN \ No newline at end of file diff --git a/.git-old/objects/56/74005e749a54fdeb798fbf4bd5031ae3f202c4 b/.git-old/objects/56/74005e749a54fdeb798fbf4bd5031ae3f202c4 deleted file mode 100644 index 13c2477..0000000 Binary files a/.git-old/objects/56/74005e749a54fdeb798fbf4bd5031ae3f202c4 and /dev/null differ diff --git a/.git-old/objects/57/1b14f337644e5664e90ccd5f67fd7ecd4d0aab b/.git-old/objects/57/1b14f337644e5664e90ccd5f67fd7ecd4d0aab deleted file mode 100644 index 97c8eb5..0000000 Binary files a/.git-old/objects/57/1b14f337644e5664e90ccd5f67fd7ecd4d0aab and /dev/null differ diff --git a/.git-old/objects/58/3feb259c1d4f6c1bc5d855081de496dee8ee34 b/.git-old/objects/58/3feb259c1d4f6c1bc5d855081de496dee8ee34 deleted file mode 100644 index ca009f4..0000000 Binary files a/.git-old/objects/58/3feb259c1d4f6c1bc5d855081de496dee8ee34 and /dev/null differ diff --git a/.git-old/objects/58/6bf9048208c66192a347f855a1bceabfd1007e b/.git-old/objects/58/6bf9048208c66192a347f855a1bceabfd1007e deleted file mode 100644 index 5a69bbc..0000000 Binary files a/.git-old/objects/58/6bf9048208c66192a347f855a1bceabfd1007e and /dev/null differ diff --git a/.git-old/objects/58/8baf3593edc45aa2e9f869d3681f78353464b6 b/.git-old/objects/58/8baf3593edc45aa2e9f869d3681f78353464b6 deleted file mode 100644 index 11da399..0000000 Binary files a/.git-old/objects/58/8baf3593edc45aa2e9f869d3681f78353464b6 and /dev/null differ diff --git a/.git-old/objects/58/95c87c7741b996d803afdea182e8051a79353f b/.git-old/objects/58/95c87c7741b996d803afdea182e8051a79353f deleted file mode 100644 index c81a26b..0000000 Binary files a/.git-old/objects/58/95c87c7741b996d803afdea182e8051a79353f and /dev/null differ diff --git a/.git-old/objects/59/0299d9ecd9a0a1ee48788500e3e6c9c663c788 b/.git-old/objects/59/0299d9ecd9a0a1ee48788500e3e6c9c663c788 deleted file mode 100644 index de8687f..0000000 Binary files a/.git-old/objects/59/0299d9ecd9a0a1ee48788500e3e6c9c663c788 and /dev/null differ diff --git a/.git-old/objects/59/4e89c413c278b18bc5766bf63297d66a605ce1 b/.git-old/objects/59/4e89c413c278b18bc5766bf63297d66a605ce1 deleted file mode 100644 index bf78882..0000000 Binary files a/.git-old/objects/59/4e89c413c278b18bc5766bf63297d66a605ce1 and /dev/null differ diff --git a/.git-old/objects/59/ac8d155933208728f7bb22864990042985090d b/.git-old/objects/59/ac8d155933208728f7bb22864990042985090d deleted file mode 100644 index 39872e7..0000000 Binary files a/.git-old/objects/59/ac8d155933208728f7bb22864990042985090d and /dev/null differ diff --git a/.git-old/objects/5a/12cb607ba2d8da03c0ec2d11d152785990d0e6 b/.git-old/objects/5a/12cb607ba2d8da03c0ec2d11d152785990d0e6 deleted file mode 100644 index 8a4f9c8..0000000 Binary files a/.git-old/objects/5a/12cb607ba2d8da03c0ec2d11d152785990d0e6 and /dev/null differ diff --git a/.git-old/objects/5a/2b5b1b5215b31b875cfa7651d265cad2584af2 b/.git-old/objects/5a/2b5b1b5215b31b875cfa7651d265cad2584af2 deleted file mode 100644 index 62c2eb9..0000000 Binary files a/.git-old/objects/5a/2b5b1b5215b31b875cfa7651d265cad2584af2 and /dev/null differ diff --git a/.git-old/objects/5a/7064b6bebbf170b7826d34b21db5f806c8f9e9 b/.git-old/objects/5a/7064b6bebbf170b7826d34b21db5f806c8f9e9 deleted file mode 100644 index 3b8da7b..0000000 Binary files a/.git-old/objects/5a/7064b6bebbf170b7826d34b21db5f806c8f9e9 and /dev/null differ diff --git a/.git-old/objects/5a/96ef7bed42117efcc455bf668c7b1202efccc3 b/.git-old/objects/5a/96ef7bed42117efcc455bf668c7b1202efccc3 deleted file mode 100644 index 0bf7a6b..0000000 --- a/.git-old/objects/5a/96ef7bed42117efcc455bf668c7b1202efccc3 +++ /dev/null @@ -1,3 +0,0 @@ -xuQr@Y_1wFRe,Z]mF0냓C.;uuuwN겤GDz (suU I늂dZ5eU֒\'/j&)Pߝj -T_AJDפ.Aee0{v~[U)vFR^r<ov[p9[k%iZiV0Cb5Ngy=H L3!4yx̏!KNDb-v;X[)+5J27 6ج#Í؟Ԟ;,`xρ] 躮V -\kIo_~=-3emkƬs 9(_:{TU-/S̸!64R4[Z^6fˁX™L/}::RXj$%}C2φ:cl Gm9qԕyykI}ż8$]4Z!M?6T"؄}o-fߋqa.u"/%MK7Mͺ2 \ No newline at end of file diff --git a/.git-old/objects/5a/c5e610bc6c8ac3090987aca6f7101cf343975d b/.git-old/objects/5a/c5e610bc6c8ac3090987aca6f7101cf343975d deleted file mode 100644 index 5c72550..0000000 Binary files a/.git-old/objects/5a/c5e610bc6c8ac3090987aca6f7101cf343975d and /dev/null differ diff --git a/.git-old/objects/5b/10600b6388b80b8fbea0631c95749eba9c61cf b/.git-old/objects/5b/10600b6388b80b8fbea0631c95749eba9c61cf deleted file mode 100644 index 3abd622..0000000 Binary files a/.git-old/objects/5b/10600b6388b80b8fbea0631c95749eba9c61cf and /dev/null differ diff --git a/.git-old/objects/5b/6f61bcd1c88f7490cf9eb20acd99552dd58529 b/.git-old/objects/5b/6f61bcd1c88f7490cf9eb20acd99552dd58529 deleted file mode 100644 index 66b75dd..0000000 Binary files a/.git-old/objects/5b/6f61bcd1c88f7490cf9eb20acd99552dd58529 and /dev/null differ diff --git a/.git-old/objects/5b/eed7c5fb7201145fc70f7d3374a93d8b4f46ba b/.git-old/objects/5b/eed7c5fb7201145fc70f7d3374a93d8b4f46ba deleted file mode 100644 index 5f8794c..0000000 Binary files a/.git-old/objects/5b/eed7c5fb7201145fc70f7d3374a93d8b4f46ba and /dev/null differ diff --git a/.git-old/objects/5d/1c2ec7a375ef8523628ddf6b984af0e5412f8e b/.git-old/objects/5d/1c2ec7a375ef8523628ddf6b984af0e5412f8e deleted file mode 100644 index 2a10bed..0000000 Binary files a/.git-old/objects/5d/1c2ec7a375ef8523628ddf6b984af0e5412f8e and /dev/null differ diff --git a/.git-old/objects/5d/28861ae0003081b85ce3b42e3452e13f1c1ba4 b/.git-old/objects/5d/28861ae0003081b85ce3b42e3452e13f1c1ba4 deleted file mode 100644 index b451142..0000000 Binary files a/.git-old/objects/5d/28861ae0003081b85ce3b42e3452e13f1c1ba4 and /dev/null differ diff --git a/.git-old/objects/5e/0bb38586de32231a4fe65f915c7f61b16af755 b/.git-old/objects/5e/0bb38586de32231a4fe65f915c7f61b16af755 deleted file mode 100644 index 35565cb..0000000 Binary files a/.git-old/objects/5e/0bb38586de32231a4fe65f915c7f61b16af755 and /dev/null differ diff --git a/.git-old/objects/5e/bee087944400c96486fd4ad81a02ce07ac7544 b/.git-old/objects/5e/bee087944400c96486fd4ad81a02ce07ac7544 deleted file mode 100644 index 6176b33..0000000 Binary files a/.git-old/objects/5e/bee087944400c96486fd4ad81a02ce07ac7544 and /dev/null differ diff --git a/.git-old/objects/5f/ae02909c368451614147d00f3521650af70d97 b/.git-old/objects/5f/ae02909c368451614147d00f3521650af70d97 deleted file mode 100644 index 9637904..0000000 Binary files a/.git-old/objects/5f/ae02909c368451614147d00f3521650af70d97 and /dev/null differ diff --git a/.git-old/objects/60/46a922afd3920e90040de525cde214d46e0f1e b/.git-old/objects/60/46a922afd3920e90040de525cde214d46e0f1e deleted file mode 100644 index b3fdc23..0000000 Binary files a/.git-old/objects/60/46a922afd3920e90040de525cde214d46e0f1e and /dev/null differ diff --git a/.git-old/objects/60/4bc3662205654c6622ff5f5b5b2948aeb83483 b/.git-old/objects/60/4bc3662205654c6622ff5f5b5b2948aeb83483 deleted file mode 100644 index 60bef8b..0000000 Binary files a/.git-old/objects/60/4bc3662205654c6622ff5f5b5b2948aeb83483 and /dev/null differ diff --git a/.git-old/objects/63/20e7c86a07d579aa3f081f0fdb60d54795f51b b/.git-old/objects/63/20e7c86a07d579aa3f081f0fdb60d54795f51b deleted file mode 100644 index 21bfc54..0000000 Binary files a/.git-old/objects/63/20e7c86a07d579aa3f081f0fdb60d54795f51b and /dev/null differ diff --git a/.git-old/objects/63/48260ed4e2753e41dea727448bbd29a9d16a50 b/.git-old/objects/63/48260ed4e2753e41dea727448bbd29a9d16a50 deleted file mode 100644 index 66482ba..0000000 Binary files a/.git-old/objects/63/48260ed4e2753e41dea727448bbd29a9d16a50 and /dev/null differ diff --git a/.git-old/objects/63/8e516504267f83f6e7baac510ba48438cab060 b/.git-old/objects/63/8e516504267f83f6e7baac510ba48438cab060 deleted file mode 100644 index 3beedda..0000000 Binary files a/.git-old/objects/63/8e516504267f83f6e7baac510ba48438cab060 and /dev/null differ diff --git a/.git-old/objects/63/c6334a1eb63207375e7fb08ffa17f0caa6aa81 b/.git-old/objects/63/c6334a1eb63207375e7fb08ffa17f0caa6aa81 deleted file mode 100644 index b253850..0000000 Binary files a/.git-old/objects/63/c6334a1eb63207375e7fb08ffa17f0caa6aa81 and /dev/null differ diff --git a/.git-old/objects/64/4b19366a15df4fe991479edf18a28cad3f4f57 b/.git-old/objects/64/4b19366a15df4fe991479edf18a28cad3f4f57 deleted file mode 100644 index b6a19cd..0000000 Binary files a/.git-old/objects/64/4b19366a15df4fe991479edf18a28cad3f4f57 and /dev/null differ diff --git a/.git-old/objects/64/8784c0481efc19073c37743a1196d64c2c754a b/.git-old/objects/64/8784c0481efc19073c37743a1196d64c2c754a deleted file mode 100644 index dd24b3b..0000000 Binary files a/.git-old/objects/64/8784c0481efc19073c37743a1196d64c2c754a and /dev/null differ diff --git a/.git-old/objects/65/3c30993b88694025fb27be7412029a6f0a826a b/.git-old/objects/65/3c30993b88694025fb27be7412029a6f0a826a deleted file mode 100644 index 718a159..0000000 Binary files a/.git-old/objects/65/3c30993b88694025fb27be7412029a6f0a826a and /dev/null differ diff --git a/.git-old/objects/68/0d14354e9a3e7809c603e50033c8e75cd8f9f7 b/.git-old/objects/68/0d14354e9a3e7809c603e50033c8e75cd8f9f7 deleted file mode 100644 index 6fec7ae..0000000 --- a/.git-old/objects/68/0d14354e9a3e7809c603e50033c8e75cd8f9f7 +++ /dev/null @@ -1,8 +0,0 @@ -x}Uv63b>1[USIX h;9 -`vgvvQ[_fyj8djcM:P1Eԩ@=P95)I;MXiGav? Oy UEahQ.QLŤnk5]G.)tt[" ծOC$d\C;R>' A9/zf?aYf?^Hi 5/,6 -uKQ |Ub4gXt$2Ad2lS,ʲZo˸/m 3_Cy`}fIt 5\:)6ۻrXNJh8WP4zNP(Ed:g-qsPk1IERG#}TlJ7< -mX̸J jmBFO WU ; -K[a&xI@bx -)I4ђ%9!U=xږa['aw{RNf7NhGbR!_rc.fZ  -({zb|A~%%Z]L)xyh,ڄqѴ-MUU9#0\ʇ1ύ(0=ϩX* u"_7bߝ soWwgH(2YmyQ7 3Kda%bFcqi -l՘ݵN,չ<27shIQׅp~F7 &&p'Qb{σk{ D*9, Limd52P8 Gvi4 ?*;"/Эf+!; ޭ<2DRdG:[ȭ-zD0-Lo@X[XaU )ZV>Ntk \ No newline at end of file diff --git a/.git-old/objects/82/91ae7cc213044a0190a9719ab5b7a64feb0826 b/.git-old/objects/82/91ae7cc213044a0190a9719ab5b7a64feb0826 deleted file mode 100644 index 5291c02..0000000 Binary files a/.git-old/objects/82/91ae7cc213044a0190a9719ab5b7a64feb0826 and /dev/null differ diff --git a/.git-old/objects/83/131cd1dc433599700c385b5de04e65ab4407f9 b/.git-old/objects/83/131cd1dc433599700c385b5de04e65ab4407f9 deleted file mode 100644 index 9b64bcb..0000000 Binary files a/.git-old/objects/83/131cd1dc433599700c385b5de04e65ab4407f9 and /dev/null differ diff --git a/.git-old/objects/83/448e939e32e99e58656c8af54525d830868ece b/.git-old/objects/83/448e939e32e99e58656c8af54525d830868ece deleted file mode 100644 index 557888e..0000000 Binary files a/.git-old/objects/83/448e939e32e99e58656c8af54525d830868ece and /dev/null differ diff --git a/.git-old/objects/83/aa70320fa4275e8e285ef66598d96e1a5dbf77 b/.git-old/objects/83/aa70320fa4275e8e285ef66598d96e1a5dbf77 deleted file mode 100644 index f0384dc..0000000 Binary files a/.git-old/objects/83/aa70320fa4275e8e285ef66598d96e1a5dbf77 and /dev/null differ diff --git a/.git-old/objects/83/c0df93adcc59d21469e69dbe22899e975f0d00 b/.git-old/objects/83/c0df93adcc59d21469e69dbe22899e975f0d00 deleted file mode 100644 index 92ca141..0000000 Binary files a/.git-old/objects/83/c0df93adcc59d21469e69dbe22899e975f0d00 and /dev/null differ diff --git a/.git-old/objects/84/067c240ba672bc14f23cfd3d333609bd75bc3e b/.git-old/objects/84/067c240ba672bc14f23cfd3d333609bd75bc3e deleted file mode 100644 index 7bf651f..0000000 --- a/.git-old/objects/84/067c240ba672bc14f23cfd3d333609bd75bc3e +++ /dev/null @@ -1 +0,0 @@ -xuˎ@E+z2ûAl`6&h018"V#ݫNMU#e )5N#1I Q)GƘ=G @A"L4MВK>S5UM, ƬAkڔ9F+OqS},p&IEcqHz`fK-7'F[:|5i!x|d91890Fl躱ZWÆY!WG'Mrܝ4廃!,A|-ܼ-x%;͜ʛʱE}\lp%]́-VdCvY.֜L/,/@`!Bŧ{^Q 9hsհ ,3tYg\&NcN ٿi[Ɗ,#g?LgocL&x$}<+LSK \ No newline at end of file diff --git a/.git-old/objects/84/764e5ad555948df83f22b92b22e3482bac7a6f b/.git-old/objects/84/764e5ad555948df83f22b92b22e3482bac7a6f deleted file mode 100644 index 072b4e9..0000000 Binary files a/.git-old/objects/84/764e5ad555948df83f22b92b22e3482bac7a6f and /dev/null differ diff --git a/.git-old/objects/84/cc8e9c8b333f3197074613e291593aea133560 b/.git-old/objects/84/cc8e9c8b333f3197074613e291593aea133560 deleted file mode 100644 index 56382f9..0000000 Binary files a/.git-old/objects/84/cc8e9c8b333f3197074613e291593aea133560 and /dev/null differ diff --git a/.git-old/objects/85/94f3f3495ee79aa96aeb9f629231f7fd7f28f1 b/.git-old/objects/85/94f3f3495ee79aa96aeb9f629231f7fd7f28f1 deleted file mode 100644 index b26878d..0000000 Binary files a/.git-old/objects/85/94f3f3495ee79aa96aeb9f629231f7fd7f28f1 and /dev/null differ diff --git a/.git-old/objects/86/5fe13390e823b1aa20f6e0ebcb7cb58bc50956 b/.git-old/objects/86/5fe13390e823b1aa20f6e0ebcb7cb58bc50956 deleted file mode 100644 index 661938e..0000000 --- a/.git-old/objects/86/5fe13390e823b1aa20f6e0ebcb7cb58bc50956 +++ /dev/null @@ -1,3 +0,0 @@ -x+)JMU051b040031QKIMK,)NM,`ԳysMg"ZjXX`*RA*~N -NH՝rutuMaP-gA#ĪB@e敥d'dfd4~`sLJY:׾OπMMrK3R3?* _!R$똵&@Y\XRYZT Y3ϐ_J8':u ^;KK'%ܱ̹ ԽNZqs'EPԂ"TjjyCaLsB!Nr>~ͬz^,TS -8$>9? 8$5>7?%Ln×{f5;_N0 %p Ҕý&w=i"qL\S0@z亊y]6}t$k3 \ No newline at end of file diff --git a/.git-old/objects/86/9a3bfe8a8d3407d70ce1c6787baeb265f04106 b/.git-old/objects/86/9a3bfe8a8d3407d70ce1c6787baeb265f04106 deleted file mode 100644 index 0a904eb..0000000 Binary files a/.git-old/objects/86/9a3bfe8a8d3407d70ce1c6787baeb265f04106 and /dev/null differ diff --git a/.git-old/objects/87/1252da8bfd9c3aa716fab775b4197d457e8c8f b/.git-old/objects/87/1252da8bfd9c3aa716fab775b4197d457e8c8f deleted file mode 100644 index 42287ea..0000000 Binary files a/.git-old/objects/87/1252da8bfd9c3aa716fab775b4197d457e8c8f and /dev/null differ diff --git a/.git-old/objects/87/8ed978a60db6e2f5375d25b6e79d9d55ae8dc9 b/.git-old/objects/87/8ed978a60db6e2f5375d25b6e79d9d55ae8dc9 deleted file mode 100644 index a8d2fd3..0000000 Binary files a/.git-old/objects/87/8ed978a60db6e2f5375d25b6e79d9d55ae8dc9 and /dev/null differ diff --git a/.git-old/objects/88/2b28e5a79a085f12998d902492c5687fe1b548 b/.git-old/objects/88/2b28e5a79a085f12998d902492c5687fe1b548 deleted file mode 100644 index d114edd..0000000 Binary files a/.git-old/objects/88/2b28e5a79a085f12998d902492c5687fe1b548 and /dev/null differ diff --git a/.git-old/objects/88/75738182a44dc43fb58b55e4a1ae5a60deab54 b/.git-old/objects/88/75738182a44dc43fb58b55e4a1ae5a60deab54 deleted file mode 100644 index 93c2bea..0000000 Binary files a/.git-old/objects/88/75738182a44dc43fb58b55e4a1ae5a60deab54 and /dev/null differ diff --git a/.git-old/objects/88/eb399ad6f8e68e4d80b2addc27d59e30bc2821 b/.git-old/objects/88/eb399ad6f8e68e4d80b2addc27d59e30bc2821 deleted file mode 100644 index 51b39f6..0000000 Binary files a/.git-old/objects/88/eb399ad6f8e68e4d80b2addc27d59e30bc2821 and /dev/null differ diff --git a/.git-old/objects/88/fd553028fc9448bc868feeb3c128dd02e181e1 b/.git-old/objects/88/fd553028fc9448bc868feeb3c128dd02e181e1 deleted file mode 100644 index 3ac2df0..0000000 --- a/.git-old/objects/88/fd553028fc9448bc868feeb3c128dd02e181e1 +++ /dev/null @@ -1,3 +0,0 @@ -x+)JMU030f040031QKIMK,)NM,`ԳysMg"ZjXX`*RA*~N -NH՝rutuMaP-gA#ĪB@e敥d'dfd5٣mRg7zs̲̼̔R݇JDն#yQ&u(fsSSҼ" ,JBhԿ?=:fm($ħd$VƧm(*faଙgx/%Vh'KK'%<̹ ԽNZqs'EPԂ"TjjyCaLsB!N!r>~ͬz^,TS -8$>9? 8$5>7?%Ln×{f5;_N0 %p Ҕý&w=i"qL\S0@z亊y]6}t$8 \ No newline at end of file diff --git a/.git-old/objects/89/125a7a5ecd9beaa892257a6570f70ff36f6a22 b/.git-old/objects/89/125a7a5ecd9beaa892257a6570f70ff36f6a22 deleted file mode 100644 index d2f7d75..0000000 --- a/.git-old/objects/89/125a7a5ecd9beaa892257a6570f70ff36f6a22 +++ /dev/null @@ -1,4 +0,0 @@ -xT=o0 _A %HvHCWCy/A޿/mI}i -3GAe7p{wwNfdUZqcB8=Xգ wq#UEz\D>ПՊTQ@;ڙN]VW -9GUCݡ%C[L SoT6{#g6]yf?fqIJ,F*}'{,*B^ -3V$+SܙxO?uMMpР~j(?ҹC  J(B)kLLe9kL7Xj;FTa#ByL*R9^`;aFB"+*qd|b$w˟1|a[\opmOP#l_oiZS#5=Mcivcn \ No newline at end of file diff --git a/.git-old/objects/91/ae21f5910a19696ab9f3fc054fa22b306b08c9 b/.git-old/objects/91/ae21f5910a19696ab9f3fc054fa22b306b08c9 deleted file mode 100644 index d1fad34..0000000 Binary files a/.git-old/objects/91/ae21f5910a19696ab9f3fc054fa22b306b08c9 and /dev/null differ diff --git a/.git-old/objects/93/bf03fef55cea07d274e3fa44fddae72f377087 b/.git-old/objects/93/bf03fef55cea07d274e3fa44fddae72f377087 deleted file mode 100644 index 4f1b173..0000000 Binary files a/.git-old/objects/93/bf03fef55cea07d274e3fa44fddae72f377087 and /dev/null differ diff --git a/.git-old/objects/93/dd55e0f33543fbf31db1e0e02c6ded3225d60d b/.git-old/objects/93/dd55e0f33543fbf31db1e0e02c6ded3225d60d deleted file mode 100644 index 59594a3..0000000 Binary files a/.git-old/objects/93/dd55e0f33543fbf31db1e0e02c6ded3225d60d and /dev/null differ diff --git a/.git-old/objects/95/b4fca9a7dfbda977452ee57af810c9d7bec3f2 b/.git-old/objects/95/b4fca9a7dfbda977452ee57af810c9d7bec3f2 deleted file mode 100644 index bf23c13..0000000 Binary files a/.git-old/objects/95/b4fca9a7dfbda977452ee57af810c9d7bec3f2 and /dev/null differ diff --git a/.git-old/objects/96/c54642d7a69843417c040223430f0146e543fb b/.git-old/objects/96/c54642d7a69843417c040223430f0146e543fb deleted file mode 100644 index 9b64538..0000000 Binary files a/.git-old/objects/96/c54642d7a69843417c040223430f0146e543fb and /dev/null differ diff --git a/.git-old/objects/98/23dc5e19d86a3c5977c5633abc487030395a57 b/.git-old/objects/98/23dc5e19d86a3c5977c5633abc487030395a57 deleted file mode 100644 index e87bbb5..0000000 Binary files a/.git-old/objects/98/23dc5e19d86a3c5977c5633abc487030395a57 and /dev/null differ diff --git a/.git-old/objects/98/31f5785ce97c03af39bcc15c29026742049a1b b/.git-old/objects/98/31f5785ce97c03af39bcc15c29026742049a1b deleted file mode 100644 index 0be114c..0000000 Binary files a/.git-old/objects/98/31f5785ce97c03af39bcc15c29026742049a1b and /dev/null differ diff --git a/.git-old/objects/98/a2a884244ef9048007c87154401e0e46d2e676 b/.git-old/objects/98/a2a884244ef9048007c87154401e0e46d2e676 deleted file mode 100644 index da77925..0000000 Binary files a/.git-old/objects/98/a2a884244ef9048007c87154401e0e46d2e676 and /dev/null differ diff --git a/.git-old/objects/99/6448f0120d7026833e03ccad7b763ff9654f32 b/.git-old/objects/99/6448f0120d7026833e03ccad7b763ff9654f32 deleted file mode 100644 index f9917bb..0000000 Binary files a/.git-old/objects/99/6448f0120d7026833e03ccad7b763ff9654f32 and /dev/null differ diff --git a/.git-old/objects/99/83060914b09260484cb406fde370912a6e6803 b/.git-old/objects/99/83060914b09260484cb406fde370912a6e6803 deleted file mode 100644 index aeef1be..0000000 Binary files a/.git-old/objects/99/83060914b09260484cb406fde370912a6e6803 and /dev/null differ diff --git a/.git-old/objects/9a/3065790f54a3607fd0dfb9a84321a4ecdc3a1b b/.git-old/objects/9a/3065790f54a3607fd0dfb9a84321a4ecdc3a1b deleted file mode 100644 index bd1879b..0000000 Binary files a/.git-old/objects/9a/3065790f54a3607fd0dfb9a84321a4ecdc3a1b and /dev/null differ diff --git a/.git-old/objects/9a/a4bfb7f9ec15061237f9e4078c5fc3d50d7495 b/.git-old/objects/9a/a4bfb7f9ec15061237f9e4078c5fc3d50d7495 deleted file mode 100644 index aeff5b7..0000000 Binary files a/.git-old/objects/9a/a4bfb7f9ec15061237f9e4078c5fc3d50d7495 and /dev/null differ diff --git a/.git-old/objects/9b/73fbb17c95bc33e30e4bf5fea2b9518196c9f5 b/.git-old/objects/9b/73fbb17c95bc33e30e4bf5fea2b9518196c9f5 deleted file mode 100644 index 4431064..0000000 Binary files a/.git-old/objects/9b/73fbb17c95bc33e30e4bf5fea2b9518196c9f5 and /dev/null differ diff --git a/.git-old/objects/9b/c4369cf2a39af07588cf9271a9be1916586c7d b/.git-old/objects/9b/c4369cf2a39af07588cf9271a9be1916586c7d deleted file mode 100644 index 30ce8ba..0000000 Binary files a/.git-old/objects/9b/c4369cf2a39af07588cf9271a9be1916586c7d and /dev/null differ diff --git a/.git-old/objects/9c/262fc64262b2a50eb642c7b965abbe730bc780 b/.git-old/objects/9c/262fc64262b2a50eb642c7b965abbe730bc780 deleted file mode 100644 index 220767b..0000000 Binary files a/.git-old/objects/9c/262fc64262b2a50eb642c7b965abbe730bc780 and /dev/null differ diff --git a/.git-old/objects/9c/445d6d364ad631bef8eda4a6a87a2177716bcc b/.git-old/objects/9c/445d6d364ad631bef8eda4a6a87a2177716bcc deleted file mode 100644 index 8b35da8..0000000 --- a/.git-old/objects/9c/445d6d364ad631bef8eda4a6a87a2177716bcc +++ /dev/null @@ -1,3 +0,0 @@ -xj =x]?YˍnJ)6VHb0 }ʈ62.O{xwuJ9p+swW6Zܜm~BJi'enb0mE ֪ggU [Qi7ttWS {,VRsfW9ncZ19| 7$曕{>&={:XC'ȇR]EeqȚ@4UWv -EŶc@Ҍ  j=2Z!uDuoCH"Xa;Υ=*,,p\˳w̶"kua3LU9+0V9v! -bof6rkQI݅|Qn=S$5G ^!<-cSܟN9?DңXΟ(*]~/1쑌 4ǿn8e80\^B@VlHdM-)XsYC -!$bL3la cnvgӗ_UY FIܔs#/܌ jN٤!g>#VÈu%si ,@z]02l_!Ϥд =Jtu4NWNfw"OQ/h,8^X5m&Ga-R I3i>+,gbtoSv@Tc/lM4c3W,R./X#jw-vU/oaHjy@>g^V$ o6Y=ݔZ \ No newline at end of file diff --git a/.git-old/objects/ac/82abb1530f4bfa612b1988840907f07ab1d43f b/.git-old/objects/ac/82abb1530f4bfa612b1988840907f07ab1d43f deleted file mode 100644 index ddccb8c..0000000 Binary files a/.git-old/objects/ac/82abb1530f4bfa612b1988840907f07ab1d43f and /dev/null differ diff --git a/.git-old/objects/ad/f6a427932f3abcbbdce05ed7ac97ef5fd82fcd b/.git-old/objects/ad/f6a427932f3abcbbdce05ed7ac97ef5fd82fcd deleted file mode 100644 index e69de29..0000000 diff --git a/.git-old/objects/ae/f055f26a5f8d220b0dc2ed8abb102e1336eca8 b/.git-old/objects/ae/f055f26a5f8d220b0dc2ed8abb102e1336eca8 deleted file mode 100644 index e2fb4f2..0000000 Binary files a/.git-old/objects/ae/f055f26a5f8d220b0dc2ed8abb102e1336eca8 and /dev/null differ diff --git a/.git-old/objects/af/2950a6ad66ffe23a4d104ab13e6e658ba8cadf b/.git-old/objects/af/2950a6ad66ffe23a4d104ab13e6e658ba8cadf deleted file mode 100644 index e2022d8..0000000 Binary files a/.git-old/objects/af/2950a6ad66ffe23a4d104ab13e6e658ba8cadf and /dev/null differ diff --git a/.git-old/objects/af/9b67578f40312ee6275a86457ee4471731a92c b/.git-old/objects/af/9b67578f40312ee6275a86457ee4471731a92c deleted file mode 100644 index 58ee573..0000000 Binary files a/.git-old/objects/af/9b67578f40312ee6275a86457ee4471731a92c and /dev/null differ diff --git a/.git-old/objects/af/ec999dcb30274ac99aa508c6f35ff2211c5534 b/.git-old/objects/af/ec999dcb30274ac99aa508c6f35ff2211c5534 deleted file mode 100644 index 660f04b..0000000 Binary files a/.git-old/objects/af/ec999dcb30274ac99aa508c6f35ff2211c5534 and /dev/null differ diff --git a/.git-old/objects/b2/fe5cf7513dbe527b3cbc55690873bec70b7314 b/.git-old/objects/b2/fe5cf7513dbe527b3cbc55690873bec70b7314 deleted file mode 100644 index 757d013..0000000 Binary files a/.git-old/objects/b2/fe5cf7513dbe527b3cbc55690873bec70b7314 and /dev/null differ diff --git a/.git-old/objects/b3/b26e8b28da1b94f5e0781eb498596dc926ac48 b/.git-old/objects/b3/b26e8b28da1b94f5e0781eb498596dc926ac48 deleted file mode 100644 index e69de29..0000000 diff --git a/.git-old/objects/b4/7034d670efffd8284d671f783673c148d7b856 b/.git-old/objects/b4/7034d670efffd8284d671f783673c148d7b856 deleted file mode 100644 index 1c91b6d..0000000 Binary files a/.git-old/objects/b4/7034d670efffd8284d671f783673c148d7b856 and /dev/null differ diff --git a/.git-old/objects/b4/bf446abfca1a4b68559f6f8d46cdcc2d806454 b/.git-old/objects/b4/bf446abfca1a4b68559f6f8d46cdcc2d806454 deleted file mode 100644 index 49e4e74..0000000 Binary files a/.git-old/objects/b4/bf446abfca1a4b68559f6f8d46cdcc2d806454 and /dev/null differ diff --git a/.git-old/objects/b5/cf0d7f57d483d01d5af77612b8477d10cd531c b/.git-old/objects/b5/cf0d7f57d483d01d5af77612b8477d10cd531c deleted file mode 100644 index 9439eac..0000000 --- a/.git-old/objects/b5/cf0d7f57d483d01d5af77612b8477d10cd531c +++ /dev/null @@ -1,4 +0,0 @@ -xuT˒0̙T[ZX{rOq b" XWi J6z{jek=~PcQRx!Js.`$bdF]f64<&AA (&Jkv4ʖqJ*4I囍?9 'PU&a"EK_IFdj]O`:& -i疛Slαı㢶[-I6AFtpJ\CE5߆ E]4IP yi^!p=FeX&]d ܒ4{ 뵈&ƾ|SEjH3ɘlAPe{ܖڎe*,.Apx09O;f !B[Nsߖ׺1լ$# iAE>7@R=D3Ɏ3C"-z-(K -2'Q Nyp\Qi.'/$TsFkaW1i ;h|>d[idص񰯴!Y >A]Ƶ~cɥ%. ̗DX1*4mHCR_}rxC)<'h -F( gkowX1)4n*[:Nw"G!d] k0;B.Y0"MinKL`[יEh!f̎ f^&4CHZD0-"y1 ƽEL}DL~|Ze ÿ+K) \ No newline at end of file diff --git a/.git-old/objects/c1/a1a32576ad17ed78f28494449bed3b89ea6ca2 b/.git-old/objects/c1/a1a32576ad17ed78f28494449bed3b89ea6ca2 deleted file mode 100644 index 7055191..0000000 Binary files a/.git-old/objects/c1/a1a32576ad17ed78f28494449bed3b89ea6ca2 and /dev/null differ diff --git a/.git-old/objects/c4/419efd4a78e0f04ada1b9d8cc144653e324fdb b/.git-old/objects/c4/419efd4a78e0f04ada1b9d8cc144653e324fdb deleted file mode 100644 index e69de29..0000000 diff --git a/.git-old/objects/c6/6ce22a0d9a89d78246dc6045b9d3d038d35043 b/.git-old/objects/c6/6ce22a0d9a89d78246dc6045b9d3d038d35043 deleted file mode 100644 index 3fc11e4..0000000 Binary files a/.git-old/objects/c6/6ce22a0d9a89d78246dc6045b9d3d038d35043 and /dev/null differ diff --git a/.git-old/objects/c7/ea947389fc03542be98c98f8ccd275f276489e b/.git-old/objects/c7/ea947389fc03542be98c98f8ccd275f276489e deleted file mode 100644 index 782ab62..0000000 Binary files a/.git-old/objects/c7/ea947389fc03542be98c98f8ccd275f276489e and /dev/null differ diff --git a/.git-old/objects/c8/00b5e7a4b46aba5fab0e5f7902ea1ef3c2cdef b/.git-old/objects/c8/00b5e7a4b46aba5fab0e5f7902ea1ef3c2cdef deleted file mode 100644 index 9a7a05f..0000000 Binary files a/.git-old/objects/c8/00b5e7a4b46aba5fab0e5f7902ea1ef3c2cdef and /dev/null differ diff --git a/.git-old/objects/c8/68cd09dd97d541db3d0ef2d860d95af8ced6a6 b/.git-old/objects/c8/68cd09dd97d541db3d0ef2d860d95af8ced6a6 deleted file mode 100644 index 2a45d01..0000000 Binary files a/.git-old/objects/c8/68cd09dd97d541db3d0ef2d860d95af8ced6a6 and /dev/null differ diff --git a/.git-old/objects/c8/8d2f446acc33cbf5d3f8d8409a0e14c01cb25d b/.git-old/objects/c8/8d2f446acc33cbf5d3f8d8409a0e14c01cb25d deleted file mode 100644 index dcef671..0000000 Binary files a/.git-old/objects/c8/8d2f446acc33cbf5d3f8d8409a0e14c01cb25d and /dev/null differ diff --git a/.git-old/objects/c9/13ed4e22e8697cc37438f35527c5e55e601823 b/.git-old/objects/c9/13ed4e22e8697cc37438f35527c5e55e601823 deleted file mode 100644 index debfeb4..0000000 Binary files a/.git-old/objects/c9/13ed4e22e8697cc37438f35527c5e55e601823 and /dev/null differ diff --git a/.git-old/objects/c9/69e92a980d7bacc8bfa759c448f6d067ded355 b/.git-old/objects/c9/69e92a980d7bacc8bfa759c448f6d067ded355 deleted file mode 100644 index 869e525..0000000 Binary files a/.git-old/objects/c9/69e92a980d7bacc8bfa759c448f6d067ded355 and /dev/null differ diff --git a/.git-old/objects/c9/c5eb67cf15ec146dcadad957d1517a51b71fd9 b/.git-old/objects/c9/c5eb67cf15ec146dcadad957d1517a51b71fd9 deleted file mode 100644 index e2a19b6..0000000 Binary files a/.git-old/objects/c9/c5eb67cf15ec146dcadad957d1517a51b71fd9 and /dev/null differ diff --git a/.git-old/objects/c9/d741a7023b900fd51630b89086e058f76c2ac7 b/.git-old/objects/c9/d741a7023b900fd51630b89086e058f76c2ac7 deleted file mode 100644 index d05e269..0000000 Binary files a/.git-old/objects/c9/d741a7023b900fd51630b89086e058f76c2ac7 and /dev/null differ diff --git a/.git-old/objects/c9/e7f78c421b4e366ab10b3fc8d5bf7f8b94879b b/.git-old/objects/c9/e7f78c421b4e366ab10b3fc8d5bf7f8b94879b deleted file mode 100644 index 73d0ef8..0000000 Binary files a/.git-old/objects/c9/e7f78c421b4e366ab10b3fc8d5bf7f8b94879b and /dev/null differ diff --git a/.git-old/objects/cb/12e5fafda275fbbf4d3b1e312f5f4b3ef4a145 b/.git-old/objects/cb/12e5fafda275fbbf4d3b1e312f5f4b3ef4a145 deleted file mode 100644 index b6c5580..0000000 Binary files a/.git-old/objects/cb/12e5fafda275fbbf4d3b1e312f5f4b3ef4a145 and /dev/null differ diff --git a/.git-old/objects/cb/560fad0f2c2c102725da71ffbaa3920e9e5990 b/.git-old/objects/cb/560fad0f2c2c102725da71ffbaa3920e9e5990 deleted file mode 100644 index 0b6b69d..0000000 Binary files a/.git-old/objects/cb/560fad0f2c2c102725da71ffbaa3920e9e5990 and /dev/null differ diff --git a/.git-old/objects/cb/8312109bcb2f560cc98c8e5e13c8d10ca1a420 b/.git-old/objects/cb/8312109bcb2f560cc98c8e5e13c8d10ca1a420 deleted file mode 100644 index 78f4bca..0000000 Binary files a/.git-old/objects/cb/8312109bcb2f560cc98c8e5e13c8d10ca1a420 and /dev/null differ diff --git a/.git-old/objects/ce/8be8e94d729f206b12427416020f68530128c2 b/.git-old/objects/ce/8be8e94d729f206b12427416020f68530128c2 deleted file mode 100644 index e46dcf8..0000000 Binary files a/.git-old/objects/ce/8be8e94d729f206b12427416020f68530128c2 and /dev/null differ diff --git a/.git-old/objects/cf/3b15f974e148c4f076af2a0aaa384fff004d93 b/.git-old/objects/cf/3b15f974e148c4f076af2a0aaa384fff004d93 deleted file mode 100644 index 9241c5b..0000000 Binary files a/.git-old/objects/cf/3b15f974e148c4f076af2a0aaa384fff004d93 and /dev/null differ diff --git a/.git-old/objects/cf/80674faa427f9013fb3bbcaf4f8fb9f9285458 b/.git-old/objects/cf/80674faa427f9013fb3bbcaf4f8fb9f9285458 deleted file mode 100644 index f62c22d..0000000 Binary files a/.git-old/objects/cf/80674faa427f9013fb3bbcaf4f8fb9f9285458 and /dev/null differ diff --git a/.git-old/objects/d1/d44f077d0d2968196952b1b6d239a052d64701 b/.git-old/objects/d1/d44f077d0d2968196952b1b6d239a052d64701 deleted file mode 100644 index 2689d3d..0000000 Binary files a/.git-old/objects/d1/d44f077d0d2968196952b1b6d239a052d64701 and /dev/null differ diff --git a/.git-old/objects/d2/7a1ea7020bbf2fcb54ce327db6ffacb44e3366 b/.git-old/objects/d2/7a1ea7020bbf2fcb54ce327db6ffacb44e3366 deleted file mode 100644 index aa8752b..0000000 Binary files a/.git-old/objects/d2/7a1ea7020bbf2fcb54ce327db6ffacb44e3366 and /dev/null differ diff --git a/.git-old/objects/d2/e6c869fa316f4fe2d790492ed530116abeb3da b/.git-old/objects/d2/e6c869fa316f4fe2d790492ed530116abeb3da deleted file mode 100644 index 7f7bdec..0000000 Binary files a/.git-old/objects/d2/e6c869fa316f4fe2d790492ed530116abeb3da and /dev/null differ diff --git a/.git-old/objects/d4/1647d41710015b22a2778225f8ecf23f27093f b/.git-old/objects/d4/1647d41710015b22a2778225f8ecf23f27093f deleted file mode 100644 index da3a35f..0000000 Binary files a/.git-old/objects/d4/1647d41710015b22a2778225f8ecf23f27093f and /dev/null differ diff --git a/.git-old/objects/d6/b984698dec94544c76a767c3dad7cfbe2e95b1 b/.git-old/objects/d6/b984698dec94544c76a767c3dad7cfbe2e95b1 deleted file mode 100644 index c53de77..0000000 Binary files a/.git-old/objects/d6/b984698dec94544c76a767c3dad7cfbe2e95b1 and /dev/null differ diff --git a/.git-old/objects/d7/89f80bd6392bbf1e5a0f50ba5f1b2c8a2a9814 b/.git-old/objects/d7/89f80bd6392bbf1e5a0f50ba5f1b2c8a2a9814 deleted file mode 100644 index 8286d89..0000000 Binary files a/.git-old/objects/d7/89f80bd6392bbf1e5a0f50ba5f1b2c8a2a9814 and /dev/null differ diff --git a/.git-old/objects/d8/0cac19b6148a218b3c42ae556f75dede0d87a0 b/.git-old/objects/d8/0cac19b6148a218b3c42ae556f75dede0d87a0 deleted file mode 100644 index 0e40da8..0000000 Binary files a/.git-old/objects/d8/0cac19b6148a218b3c42ae556f75dede0d87a0 and /dev/null differ diff --git a/.git-old/objects/d8/8603e32da6f55b09399a011eb75d7f165914f7 b/.git-old/objects/d8/8603e32da6f55b09399a011eb75d7f165914f7 deleted file mode 100644 index edd787a..0000000 Binary files a/.git-old/objects/d8/8603e32da6f55b09399a011eb75d7f165914f7 and /dev/null differ diff --git a/.git-old/objects/d8/94012e62837f359a61c2051564355af77eafe6 b/.git-old/objects/d8/94012e62837f359a61c2051564355af77eafe6 deleted file mode 100644 index e69de29..0000000 diff --git a/.git-old/objects/d9/7bf01a9b7783ff543d53b3a5c4fa9ae7a38d04 b/.git-old/objects/d9/7bf01a9b7783ff543d53b3a5c4fa9ae7a38d04 deleted file mode 100644 index 0904ccf..0000000 Binary files a/.git-old/objects/d9/7bf01a9b7783ff543d53b3a5c4fa9ae7a38d04 and /dev/null differ diff --git a/.git-old/objects/da/ab3a592ab325ca6023643788cd9b9744429f4b b/.git-old/objects/da/ab3a592ab325ca6023643788cd9b9744429f4b deleted file mode 100644 index ea9be3e..0000000 Binary files a/.git-old/objects/da/ab3a592ab325ca6023643788cd9b9744429f4b and /dev/null differ diff --git a/.git-old/objects/dc/1073fcc16170567bc7f695f05eb76973b10305 b/.git-old/objects/dc/1073fcc16170567bc7f695f05eb76973b10305 deleted file mode 100644 index 119c783..0000000 --- a/.git-old/objects/dc/1073fcc16170567bc7f695f05eb76973b10305 +++ /dev/null @@ -1 +0,0 @@ -xKOR04bV*J,IUR0QP*.I,*uAԼ3'5/$KiPR*ON,kuF !Pbc^ \ No newline at end of file diff --git a/.git-old/objects/dc/b7df052c0b09b155b4f0cd8dc68c3d44271ce6 b/.git-old/objects/dc/b7df052c0b09b155b4f0cd8dc68c3d44271ce6 deleted file mode 100644 index c834ccc..0000000 Binary files a/.git-old/objects/dc/b7df052c0b09b155b4f0cd8dc68c3d44271ce6 and /dev/null differ diff --git a/.git-old/objects/dd/2001c8e1a6f5649f3de8c7865da3660275a516 b/.git-old/objects/dd/2001c8e1a6f5649f3de8c7865da3660275a516 deleted file mode 100644 index 4efbdc2..0000000 Binary files a/.git-old/objects/dd/2001c8e1a6f5649f3de8c7865da3660275a516 and /dev/null differ diff --git a/.git-old/objects/dd/208caf102612040c20cab1027fa79e326b3c46 b/.git-old/objects/dd/208caf102612040c20cab1027fa79e326b3c46 deleted file mode 100644 index 10af2c5..0000000 --- a/.git-old/objects/dd/208caf102612040c20cab1027fa79e326b3c46 +++ /dev/null @@ -1,2 +0,0 @@ -xNj1_1BzR+8kgRB -B0U&BbHVd ^W$%j G l<;١6n^5>d*|ێ]8S2!xjs(A:PI9 Lgڏߞl yyu_z \ No newline at end of file diff --git a/.git-old/objects/dd/3497ef755c1f1d887640433ab0075acfd668b6 b/.git-old/objects/dd/3497ef755c1f1d887640433ab0075acfd668b6 deleted file mode 100644 index 58fb40b..0000000 Binary files a/.git-old/objects/dd/3497ef755c1f1d887640433ab0075acfd668b6 and /dev/null differ diff --git a/.git-old/objects/df/3b35c8479599a8d65953a95bd4ccaded31aca9 b/.git-old/objects/df/3b35c8479599a8d65953a95bd4ccaded31aca9 deleted file mode 100644 index 150ff05..0000000 Binary files a/.git-old/objects/df/3b35c8479599a8d65953a95bd4ccaded31aca9 and /dev/null differ diff --git a/.git-old/objects/e1/fd630713a516cb53ab58a3446bc2443e34e505 b/.git-old/objects/e1/fd630713a516cb53ab58a3446bc2443e34e505 deleted file mode 100644 index 8a74d00..0000000 Binary files a/.git-old/objects/e1/fd630713a516cb53ab58a3446bc2443e34e505 and /dev/null differ diff --git a/.git-old/objects/e3/416b88250a5ff0a124ba92c027ee163f32b4c8 b/.git-old/objects/e3/416b88250a5ff0a124ba92c027ee163f32b4c8 deleted file mode 100644 index c05ebc3..0000000 Binary files a/.git-old/objects/e3/416b88250a5ff0a124ba92c027ee163f32b4c8 and /dev/null differ diff --git a/.git-old/objects/e3/fafff8d459351b00dec7ff222818f6b3d9539d b/.git-old/objects/e3/fafff8d459351b00dec7ff222818f6b3d9539d deleted file mode 100644 index 6bce85f..0000000 --- a/.git-old/objects/e3/fafff8d459351b00dec7ff222818f6b3d9539d +++ /dev/null @@ -1 +0,0 @@ -x1 0`J[U28R4 &brUDI {|FѮUn{r(@=jz0s51h['b.t**.y*=-`z9236k˨)fU'~ \ No newline at end of file diff --git a/.git-old/objects/e4/615cadc33a8698f3777623662b72170192d0f7 b/.git-old/objects/e4/615cadc33a8698f3777623662b72170192d0f7 deleted file mode 100644 index 212e1f5..0000000 Binary files a/.git-old/objects/e4/615cadc33a8698f3777623662b72170192d0f7 and /dev/null differ diff --git a/.git-old/objects/e5/6e86d6254960db60e6f6dca39b2e0d13edd4c7 b/.git-old/objects/e5/6e86d6254960db60e6f6dca39b2e0d13edd4c7 deleted file mode 100644 index e69de29..0000000 diff --git a/.git-old/objects/e5/8e8dc09c0e5d4fc3e8766c690c442a940dc82e b/.git-old/objects/e5/8e8dc09c0e5d4fc3e8766c690c442a940dc82e deleted file mode 100644 index 635eaa5..0000000 Binary files a/.git-old/objects/e5/8e8dc09c0e5d4fc3e8766c690c442a940dc82e and /dev/null differ diff --git a/.git-old/objects/e7/87b263fecd493ee73c86beb07768ac7962090d b/.git-old/objects/e7/87b263fecd493ee73c86beb07768ac7962090d deleted file mode 100644 index 3331bd4..0000000 Binary files a/.git-old/objects/e7/87b263fecd493ee73c86beb07768ac7962090d and /dev/null differ diff --git a/.git-old/objects/e7/e00964b0fd053c4e8f11d8dd583ca286a98f3e b/.git-old/objects/e7/e00964b0fd053c4e8f11d8dd583ca286a98f3e deleted file mode 100644 index 7aed3c9..0000000 Binary files a/.git-old/objects/e7/e00964b0fd053c4e8f11d8dd583ca286a98f3e and /dev/null differ diff --git a/.git-old/objects/e8/d6d11a7c447027b3099632858c5ee17323d07c b/.git-old/objects/e8/d6d11a7c447027b3099632858c5ee17323d07c deleted file mode 100644 index 1cb0a8c..0000000 Binary files a/.git-old/objects/e8/d6d11a7c447027b3099632858c5ee17323d07c and /dev/null differ diff --git a/.git-old/objects/e9/0953f125480a9eb012c963c96348ace3032d8c b/.git-old/objects/e9/0953f125480a9eb012c963c96348ace3032d8c deleted file mode 100644 index 47bd98d..0000000 Binary files a/.git-old/objects/e9/0953f125480a9eb012c963c96348ace3032d8c and /dev/null differ diff --git a/.git-old/objects/e9/156b0bb6bf88fd35d289342fb22430ee1ff018 b/.git-old/objects/e9/156b0bb6bf88fd35d289342fb22430ee1ff018 deleted file mode 100644 index 6132252..0000000 Binary files a/.git-old/objects/e9/156b0bb6bf88fd35d289342fb22430ee1ff018 and /dev/null differ diff --git a/.git-old/objects/e9/45c8169cba65a289047d4b9640d51fcacfac5c b/.git-old/objects/e9/45c8169cba65a289047d4b9640d51fcacfac5c deleted file mode 100644 index 0a374e3..0000000 Binary files a/.git-old/objects/e9/45c8169cba65a289047d4b9640d51fcacfac5c and /dev/null differ diff --git a/.git-old/objects/ea/0b7ac499f01bbe4076ecb100acc70642bcb595 b/.git-old/objects/ea/0b7ac499f01bbe4076ecb100acc70642bcb595 deleted file mode 100644 index cc22836..0000000 Binary files a/.git-old/objects/ea/0b7ac499f01bbe4076ecb100acc70642bcb595 and /dev/null differ diff --git a/.git-old/objects/ea/0c8df5bbbc386209b39d16180e9a17b300e4b4 b/.git-old/objects/ea/0c8df5bbbc386209b39d16180e9a17b300e4b4 deleted file mode 100644 index fa52c8b..0000000 Binary files a/.git-old/objects/ea/0c8df5bbbc386209b39d16180e9a17b300e4b4 and /dev/null differ diff --git a/.git-old/objects/ea/2bda53a7b5e0fcb6033cd99e74c8e841edb3a1 b/.git-old/objects/ea/2bda53a7b5e0fcb6033cd99e74c8e841edb3a1 deleted file mode 100644 index 368046f..0000000 Binary files a/.git-old/objects/ea/2bda53a7b5e0fcb6033cd99e74c8e841edb3a1 and /dev/null differ diff --git a/.git-old/objects/ea/39b7cd5d90001dfa4d1d6fe0fb8f6296c62a84 b/.git-old/objects/ea/39b7cd5d90001dfa4d1d6fe0fb8f6296c62a84 deleted file mode 100644 index 0816b18..0000000 Binary files a/.git-old/objects/ea/39b7cd5d90001dfa4d1d6fe0fb8f6296c62a84 and /dev/null differ diff --git a/.git-old/objects/eb/1a614d9cff975cdd0bfce32d35564d6ffc0eea b/.git-old/objects/eb/1a614d9cff975cdd0bfce32d35564d6ffc0eea deleted file mode 100644 index 9014eae..0000000 Binary files a/.git-old/objects/eb/1a614d9cff975cdd0bfce32d35564d6ffc0eea and /dev/null differ diff --git a/.git-old/objects/eb/41ee5bfb08e24e8cd135ea100a0c7c5b2d15bc b/.git-old/objects/eb/41ee5bfb08e24e8cd135ea100a0c7c5b2d15bc deleted file mode 100644 index 695945c..0000000 Binary files a/.git-old/objects/eb/41ee5bfb08e24e8cd135ea100a0c7c5b2d15bc and /dev/null differ diff --git a/.git-old/objects/eb/f9c055cc3b16856394b487d9cb62d1515ee578 b/.git-old/objects/eb/f9c055cc3b16856394b487d9cb62d1515ee578 deleted file mode 100644 index 1900ebb..0000000 Binary files a/.git-old/objects/eb/f9c055cc3b16856394b487d9cb62d1515ee578 and /dev/null differ diff --git a/.git-old/objects/ec/0d5fd760f9c4cca93503909ec9415e53a50c19 b/.git-old/objects/ec/0d5fd760f9c4cca93503909ec9415e53a50c19 deleted file mode 100644 index 5ae3edf..0000000 Binary files a/.git-old/objects/ec/0d5fd760f9c4cca93503909ec9415e53a50c19 and /dev/null differ diff --git a/.git-old/objects/ec/b4915ca9c7416346b7570e8925155a7fd6109d b/.git-old/objects/ec/b4915ca9c7416346b7570e8925155a7fd6109d deleted file mode 100644 index 013bb42..0000000 Binary files a/.git-old/objects/ec/b4915ca9c7416346b7570e8925155a7fd6109d and /dev/null differ diff --git a/.git-old/objects/ed/8ecf6d115d8d1e662ec38992c17dfaf0830743 b/.git-old/objects/ed/8ecf6d115d8d1e662ec38992c17dfaf0830743 deleted file mode 100644 index d191c02..0000000 Binary files a/.git-old/objects/ed/8ecf6d115d8d1e662ec38992c17dfaf0830743 and /dev/null differ diff --git a/.git-old/objects/ee/0fee0eaec8e0f4067dae35d20d1fd310bbe44e b/.git-old/objects/ee/0fee0eaec8e0f4067dae35d20d1fd310bbe44e deleted file mode 100644 index fcb5834..0000000 Binary files a/.git-old/objects/ee/0fee0eaec8e0f4067dae35d20d1fd310bbe44e and /dev/null differ diff --git a/.git-old/objects/ef/3647a80b7e2c0cf99a91aae98890c806d3ee15 b/.git-old/objects/ef/3647a80b7e2c0cf99a91aae98890c806d3ee15 deleted file mode 100644 index a3dc786..0000000 Binary files a/.git-old/objects/ef/3647a80b7e2c0cf99a91aae98890c806d3ee15 and /dev/null differ diff --git a/.git-old/objects/ef/7111cc05cb05682a0f6a3095049c5b23b650d7 b/.git-old/objects/ef/7111cc05cb05682a0f6a3095049c5b23b650d7 deleted file mode 100644 index 2b1f7cf..0000000 Binary files a/.git-old/objects/ef/7111cc05cb05682a0f6a3095049c5b23b650d7 and /dev/null differ diff --git a/.git-old/objects/f0/06416264a594414d3f70f2a18c492463b869e6 b/.git-old/objects/f0/06416264a594414d3f70f2a18c492463b869e6 deleted file mode 100644 index ed6f0ba..0000000 Binary files a/.git-old/objects/f0/06416264a594414d3f70f2a18c492463b869e6 and /dev/null differ diff --git a/.git-old/objects/f0/f52c20ede4edb0c4cada3d741e8137a93aa0f3 b/.git-old/objects/f0/f52c20ede4edb0c4cada3d741e8137a93aa0f3 deleted file mode 100644 index ef0e04a..0000000 Binary files a/.git-old/objects/f0/f52c20ede4edb0c4cada3d741e8137a93aa0f3 and /dev/null differ diff --git a/.git-old/objects/f1/39ed54d562c92c7263098d6e463e26fdbe2f69 b/.git-old/objects/f1/39ed54d562c92c7263098d6e463e26fdbe2f69 deleted file mode 100644 index c0f7ac0..0000000 Binary files a/.git-old/objects/f1/39ed54d562c92c7263098d6e463e26fdbe2f69 and /dev/null differ diff --git a/.git-old/objects/f1/4097ef6012760bfda159183469c5c5826ab9ce b/.git-old/objects/f1/4097ef6012760bfda159183469c5c5826ab9ce deleted file mode 100644 index 64398a1..0000000 --- a/.git-old/objects/f1/4097ef6012760bfda159183469c5c5826ab9ce +++ /dev/null @@ -1 +0,0 @@ -xj0{S챥PɂP* ˁzaZh^Fg=*F/1Lb)ls⎝)DO*E\T ܙؒxuXqZA~h7Rû<%Nz^CpDZ@!v ^ ñ_ҹ7-ycZ \ No newline at end of file diff --git a/.git-old/objects/f1/c9c87940494caa4b17636afc4afce678f00f73 b/.git-old/objects/f1/c9c87940494caa4b17636afc4afce678f00f73 deleted file mode 100644 index 4f59e6c..0000000 Binary files a/.git-old/objects/f1/c9c87940494caa4b17636afc4afce678f00f73 and /dev/null differ diff --git a/.git-old/objects/f2/2bedb6bb3957fc6619b4faa5c7b82e850dca97 b/.git-old/objects/f2/2bedb6bb3957fc6619b4faa5c7b82e850dca97 deleted file mode 100644 index 9e74ab4..0000000 Binary files a/.git-old/objects/f2/2bedb6bb3957fc6619b4faa5c7b82e850dca97 and /dev/null differ diff --git a/.git-old/objects/f2/b95058188829d876a1594e7a50ebb80277e30c b/.git-old/objects/f2/b95058188829d876a1594e7a50ebb80277e30c deleted file mode 100644 index 880567e..0000000 Binary files a/.git-old/objects/f2/b95058188829d876a1594e7a50ebb80277e30c and /dev/null differ diff --git a/.git-old/objects/f2/e0c897c72491d42cfcbd2d5da15fcc51d08042 b/.git-old/objects/f2/e0c897c72491d42cfcbd2d5da15fcc51d08042 deleted file mode 100644 index 9a27227..0000000 Binary files a/.git-old/objects/f2/e0c897c72491d42cfcbd2d5da15fcc51d08042 and /dev/null differ diff --git a/.git-old/objects/f3/4c555a6504459d099cf7663e8c5540dddcfd5e b/.git-old/objects/f3/4c555a6504459d099cf7663e8c5540dddcfd5e deleted file mode 100644 index f82605f..0000000 --- a/.git-old/objects/f3/4c555a6504459d099cf7663e8c5540dddcfd5e +++ /dev/null @@ -1,3 +0,0 @@ -xKj0 s -; rCUDIL3uSJʘ?4KE];2-#&FaS߷mM.! v⁐tU5םDX`G^nųu17P%H]MT嵌_+]8v'+ ($:I(S6̱Дx'rF`s,TNX%6|8wv.> -x?ݕ7M? }I \ No newline at end of file diff --git a/.git-old/objects/f3/b79f601d4b8e086fd1df4c46375582ee517033 b/.git-old/objects/f3/b79f601d4b8e086fd1df4c46375582ee517033 deleted file mode 100644 index 11ea02f..0000000 Binary files a/.git-old/objects/f3/b79f601d4b8e086fd1df4c46375582ee517033 and /dev/null differ diff --git a/.git-old/objects/f4/0c0edc4075efc60b387b9d1c2376095d64b524 b/.git-old/objects/f4/0c0edc4075efc60b387b9d1c2376095d64b524 deleted file mode 100644 index cdc82db..0000000 Binary files a/.git-old/objects/f4/0c0edc4075efc60b387b9d1c2376095d64b524 and /dev/null differ diff --git a/.git-old/objects/f4/9a6d062bc115b506607744fb86258c3ebe72f4 b/.git-old/objects/f4/9a6d062bc115b506607744fb86258c3ebe72f4 deleted file mode 100644 index a59fe63..0000000 --- a/.git-old/objects/f4/9a6d062bc115b506607744fb86258c3ebe72f4 +++ /dev/null @@ -1,5 +0,0 @@ -xTM0 _a-V - b/H9!8,*m=l? qD/g)E;p|cqdu.qCԘB=7>[ݡ wu#uIf]D~߫4Ğ,f:NV_WW -9>EK&678QOݨ+ߖy|g*G?rf}1*k^~k}ᆱ(HHQލpBҢ&P;aFFU]`u- uF+{$p{τ9SƔHuX`4vF~xdȚb"tݻԶٓ~;mvF.ş%wn暱 Kg'-89 ?-떄tQŴfj(M/y#= \ No newline at end of file diff --git a/.git-old/objects/f4/ed8846ce0e72aab9775884ac7b3c857f00194a b/.git-old/objects/f4/ed8846ce0e72aab9775884ac7b3c857f00194a deleted file mode 100644 index 0318e0c..0000000 Binary files a/.git-old/objects/f4/ed8846ce0e72aab9775884ac7b3c857f00194a and /dev/null differ diff --git a/.git-old/objects/f5/2f7f1af61c6bf62b8f77ea4edfbf720ac72249 b/.git-old/objects/f5/2f7f1af61c6bf62b8f77ea4edfbf720ac72249 deleted file mode 100644 index 250b36a..0000000 Binary files a/.git-old/objects/f5/2f7f1af61c6bf62b8f77ea4edfbf720ac72249 and /dev/null differ diff --git a/.git-old/objects/f5/8599a5fcbe79fa68a976918c806c9c82dc6936 b/.git-old/objects/f5/8599a5fcbe79fa68a976918c806c9c82dc6936 deleted file mode 100644 index f0f84ca..0000000 Binary files a/.git-old/objects/f5/8599a5fcbe79fa68a976918c806c9c82dc6936 and /dev/null differ diff --git a/.git-old/objects/f5/b5513ca383b7a91f8ecdc9d0182520089562f9 b/.git-old/objects/f5/b5513ca383b7a91f8ecdc9d0182520089562f9 deleted file mode 100644 index 9383557..0000000 Binary files a/.git-old/objects/f5/b5513ca383b7a91f8ecdc9d0182520089562f9 and /dev/null differ diff --git a/.git-old/objects/f7/94d5ac4ba8d1be97050a24f0211be1351a97ea b/.git-old/objects/f7/94d5ac4ba8d1be97050a24f0211be1351a97ea deleted file mode 100644 index e197c93..0000000 Binary files a/.git-old/objects/f7/94d5ac4ba8d1be97050a24f0211be1351a97ea and /dev/null differ diff --git a/.git-old/objects/f8/24a37a2c8ea05628dfacc4d8de0549a3dfaa1c b/.git-old/objects/f8/24a37a2c8ea05628dfacc4d8de0549a3dfaa1c deleted file mode 100644 index e547f3d..0000000 Binary files a/.git-old/objects/f8/24a37a2c8ea05628dfacc4d8de0549a3dfaa1c and /dev/null differ diff --git a/.git-old/objects/f8/7288e052c81a8e751bc74a17644fda88ef6413 b/.git-old/objects/f8/7288e052c81a8e751bc74a17644fda88ef6413 deleted file mode 100644 index ffb8e36..0000000 Binary files a/.git-old/objects/f8/7288e052c81a8e751bc74a17644fda88ef6413 and /dev/null differ diff --git a/.git-old/objects/fb/0d7c595ee3a4b90f02c671689da8b0a4a9d81b b/.git-old/objects/fb/0d7c595ee3a4b90f02c671689da8b0a4a9d81b deleted file mode 100644 index 53893bf..0000000 --- a/.git-old/objects/fb/0d7c595ee3a4b90f02c671689da8b0a4a9d81b +++ /dev/null @@ -1,8 +0,0 @@ -xˎ0((V -6.3ꢫJt1FN$` *U}dsaQUD$c>ݬSvfaa D3KՆO3Om½fmQr].1_4/S#bvJK^(t:9{dꤠxAGl[* (hx~?U0 -|<֏wŘ!ʂQ|OEdYkf(c#ħc#OVJ[-,t0>-qե2ON7l8ͯy){:G<ծ]տNcb\6j21vw ߪh_ GԤgG7} -HY]auiN}xmת>Fxb!_N \+4渪btt !:y>Y p\i}Q\okj.~j#CdŶxv>^ -H@ Z, $ - -\@v@66o F1A4Y[! ^~J^7A}9LZ8A8?`NH1?99Z~I7m>+eܱ \ No newline at end of file diff --git a/.git-old/objects/fd/6285e11d8c2c0f20dbaae30ef04008caa79747 b/.git-old/objects/fd/6285e11d8c2c0f20dbaae30ef04008caa79747 deleted file mode 100644 index 349bd41..0000000 Binary files a/.git-old/objects/fd/6285e11d8c2c0f20dbaae30ef04008caa79747 and /dev/null differ diff --git a/.git-old/objects/fd/b4bd3a49c7883ba1f832f9818b427dc18b4e35 b/.git-old/objects/fd/b4bd3a49c7883ba1f832f9818b427dc18b4e35 deleted file mode 100644 index 70ae5ac..0000000 Binary files a/.git-old/objects/fd/b4bd3a49c7883ba1f832f9818b427dc18b4e35 and /dev/null differ diff --git a/.git-old/objects/fe/390873563971b3dd7a7bdb6918840ee0fca126 b/.git-old/objects/fe/390873563971b3dd7a7bdb6918840ee0fca126 deleted file mode 100644 index 20c951e..0000000 Binary files a/.git-old/objects/fe/390873563971b3dd7a7bdb6918840ee0fca126 and /dev/null differ diff --git a/.git-old/objects/pack/pack-c4ea6cf37a4c77a2be657fb21102c62ea939a33f.idx b/.git-old/objects/pack/pack-c4ea6cf37a4c77a2be657fb21102c62ea939a33f.idx deleted file mode 100644 index 7070564..0000000 Binary files a/.git-old/objects/pack/pack-c4ea6cf37a4c77a2be657fb21102c62ea939a33f.idx and /dev/null differ diff --git a/.git-old/objects/pack/pack-c4ea6cf37a4c77a2be657fb21102c62ea939a33f.pack b/.git-old/objects/pack/pack-c4ea6cf37a4c77a2be657fb21102c62ea939a33f.pack deleted file mode 100644 index 40f60e8..0000000 Binary files a/.git-old/objects/pack/pack-c4ea6cf37a4c77a2be657fb21102c62ea939a33f.pack and /dev/null differ diff --git a/.git-old/packed-refs b/.git-old/packed-refs deleted file mode 100644 index 99fcbe5..0000000 --- a/.git-old/packed-refs +++ /dev/null @@ -1,4 +0,0 @@ -# pack-refs with: peeled fully-peeled -0476e44bce8cdbf1a9708b5ff34135437da90481 refs/remotes/origin/beta -e9eb6c1c9e0d446445216a8c75e12b77fb2ac0ba refs/remotes/origin/improve-video-player -342e850ca9c5d26e50ed5a02a526651654b0ec17 refs/remotes/origin/master diff --git a/.git-old/refs/heads/master b/.git-old/refs/heads/master deleted file mode 100644 index 8d46d13..0000000 --- a/.git-old/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -adf6a427932f3abcbbdce05ed7ac97ef5fd82fcd diff --git a/.git-old/refs/remotes/origin/HEAD b/.git-old/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28f..0000000 --- a/.git-old/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/.git-old/refs/remotes/origin/beta b/.git-old/refs/remotes/origin/beta deleted file mode 100644 index a9d2eec..0000000 --- a/.git-old/refs/remotes/origin/beta +++ /dev/null @@ -1 +0,0 @@ -e8d6d11a7c447027b3099632858c5ee17323d07c diff --git a/.git-old/refs/remotes/origin/master b/.git-old/refs/remotes/origin/master deleted file mode 100644 index f2e0d84..0000000 --- a/.git-old/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -e787b263fecd493ee73c86beb07768ac7962090d diff --git a/.git-old/refs/stash b/.git-old/refs/stash deleted file mode 100644 index a4581a3..0000000 --- a/.git-old/refs/stash +++ /dev/null @@ -1 +0,0 @@ -716939497baec281e1e63212b8b7baac08093527 diff --git a/.gitignore b/.gitignore index 1a330ad..bef93d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ *.pyc *.log .vscode -path_to_browser.json \ No newline at end of file +./json_objects/display_data.json +./json_objects/next_bankslot_number.json +./json_objects/settings.json diff --git a/actions.py b/actions.py index b759489..6cf3a72 100644 --- a/actions.py +++ b/actions.py @@ -220,12 +220,23 @@ class Actions(object): self.change_composite_setting(setting_value) def check_and_set_output_mode_on_boot(self): + #### checking if pi display mode is composite response = str(subprocess.check_output(['tvservice', '-s'])) if '0x80002' in response or '0x40002' in response: self.data.update_setting_value('video', 'OUTPUT', 'composite') else: self.data.update_setting_value('video', 'OUTPUT', 'hdmi') + def check_dev_mode(self): + #### check if in dev mode:(ie not using the lcd screen) + with open('/boot/config.txt', 'r') as config: + if '##no_waveshare_overlay' in config.read(): + print('it is in !') + self.data.update_setting_value('other','DEV_MODE_RESET', 'on') + else: + print('it is not in !') + self.data.update_setting_value('other','DEV_MODE_RESET', 'off') + def change_composite_setting(self, setting_value): if setting_value == 'composite': mode = self.data.settings['video']['COMPOSITE_TYPE']['value'] @@ -268,23 +279,23 @@ class Actions(object): def switch_dev_mode(self, state): if state == 'on': - self.run_script('switch_display_to_hdmi') + self.switch_display_to_hdmi() elif state == 'off': - self.run_script('switch_display_to_lcd') + self.switch_display_to_lcd() def switch_display_to_hdmi(self): - with open('/boot/config', 'r') as config: + with open('/boot/config.txt', 'r') as config: with open('/usr/share/X11/xorg.conf.d/99-fbturbo.conf') as framebuffer_conf: - if 'dtoverlay=waveshare35a:rotate=270' in config and 'dev/fb1' in framebuffer_conf: + if 'dtoverlay=waveshare35a:rotate=270' in config.read() and 'dev/fb1' in framebuffer_conf.read(): self.run_script('switch_display_to_hdmi') else: self.message_handler.set_message('INFO', 'failed to switch display') def switch_display_to_lcd(self): - with open('/boot/config', 'r') as config: + with open('/boot/config.txt', 'r') as config: with open('/usr/share/X11/xorg.conf.d/99-fbturbo.conf') as framebuffer_conf: - if '##no_waveshare_overlay' in config and 'dev/fb0' in framebuffer_conf: + if '##no_waveshare_overlay' in config.read() and 'dev/fb0' in framebuffer_conf.read(): self.run_script('switch_display_to_lcd') else: self.message_handler.set_message('INFO', 'failed to switch display') diff --git a/data_centre/data.py b/data_centre/data.py index 8b30b2a..a5101d6 100644 --- a/data_centre/data.py +++ b/data_centre/data.py @@ -13,10 +13,11 @@ class Data(object): BANK_DATA_JSON = 'display_data.json' NEXT_BANKSLOT_JSON = 'next_bankslot_number.json' SETTINGS_JSON = 'settings.json' + DEFAULT_SETTINGS_JSON = 'settings_default.json' KEYPAD_MAPPING_JSON = 'keypad_action_mapping.json' MIDI_MAPPING_JSON = 'midi_action_mapping.json' EMPTY_SLOT = dict(name='', location='', length=-1, start=-1, end=-1, rate=1) - PATH_TO_DATA_OBJECTS = '/home/pi/r_e_c_u_r/data_centre/json_objects/' + PATH_TO_DATA_OBJECTS = '/home/pi/r_e_c_u_r/json_objects/' PATH_TO_EXTERNAL_DEVICES = '/media/pi' def __init__(self, message_handler): @@ -35,10 +36,19 @@ class Data(object): self.update_screen = True self.player_mode = 'now' - ### persisted data: - self.bank_data = self._read_json(self.BANK_DATA_JSON) - self.next_bankslot = self._read_json(self.NEXT_BANKSLOT_JSON) - self.settings = self._read_json(self.SETTINGS_JSON) + ### persisted data (use default if doesnt exits): + self.bank_data = [self.EMPTY_BANK] + if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.BANK_DATA_JSON): + self.bank_data = self._read_json(self.BANK_DATA_JSON) + + self.next_bankslot = '0-0' + if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.NEXT_BANKSLOT_JSON): + self.next_bankslot = self._read_json(self.NEXT_BANKSLOT_JSON) + + self.settings = self._read_json(self.DEFAULT_SETTINGS_JSON) + if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON): + self.settings = self._read_json(self.SETTINGS_JSON) + self.key_mappings = self._read_json(self.KEYPAD_MAPPING_JSON) self.midi_mappings = self._read_json(self.MIDI_MAPPING_JSON) diff --git a/data_centre/json_objects/display_data.json b/data_centre/json_objects/display_data.json deleted file mode 100644 index fa54dee..0000000 --- a/data_centre/json_objects/display_data.json +++ /dev/null @@ -1,166 +0,0 @@ -[ - [ - { - "end": -1, - "length": 49.28, - "location": "/media/pi/5EB5-664C/recur test videos/colour_pixal_01.mp4", - "name": "colour_pixal_01.mp4", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": 87.04, - "location": "/media/pi/5EB5-664C/recur test videos/colour_pixal_02.mp4", - "name": "colour_pixal_02.mp4", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": 52.757, - "location": "/media/pi/5EB5-664C/recur test videos/colour_pixal_03.mp4", - "name": "colour_pixal_03.mp4", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": 40.533, - "location": "/media/pi/5EB5-664C/recur test videos/colour_pixal_04.mp4", - "name": "colour_pixal_04.mp4", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": 804.245, - "location": "/media/pi/5EB5-664C/recur test videos/long_spinning.mp4", - "name": "long_spinning.mp4", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - } - ], - [ - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - }, - { - "end": -1, - "length": -1, - "location": "", - "name": "", - "rate": 1, - "start": -1 - } - ] -] \ No newline at end of file diff --git a/data_centre/json_objects/next_bankslot_number.json b/data_centre/json_objects/next_bankslot_number.json deleted file mode 100644 index 168d985..0000000 --- a/data_centre/json_objects/next_bankslot_number.json +++ /dev/null @@ -1 +0,0 @@ -"0-2" \ No newline at end of file diff --git a/display_centre/display.py b/display_centre/display.py index bc10990..4f1e467 100644 --- a/display_centre/display.py +++ b/display_centre/display.py @@ -14,8 +14,8 @@ class Display(object): self.capture = capture self.message_handler = message_handler self.data = data - self.browser_menu = menu.BrowserMenu(self.data, self.MENU_HEIGHT) - self.settings_menu = menu.SettingsMenu(self.data, self.MENU_HEIGHT) + self.browser_menu = menu.BrowserMenu(self.data, self.message_handler, self.MENU_HEIGHT) + self.settings_menu = menu.SettingsMenu(self.data, self.message_handler, self.MENU_HEIGHT) #self.top_menu_index = 0 #self.selected_list_index = self.top_menu_index diff --git a/display_centre/menu.py b/display_centre/menu.py index 81d07cd..76f6ad7 100644 --- a/display_centre/menu.py +++ b/display_centre/menu.py @@ -1,8 +1,9 @@ import os class Menu(object): - def __init__(self, data, menu_height): - self.data = data + def __init__(self, data, message_handler, menu_height): + self.data = data + self.message_handler = message_handler self.open_folders = [] self.menu_list = [] self.menu_height = menu_height @@ -79,8 +80,8 @@ class Menu(object): return True, dir_name.lstrip() class BrowserMenu(Menu): - def __init__(self, data, menu_height): - Menu.__init__(self, data, menu_height) + def __init__(self, data, message_handler, menu_height): + Menu.__init__(self, data, message_handler, menu_height) self.generate_browser_list() def generate_browser_list(self): @@ -145,8 +146,8 @@ class SettingsMenu(Menu): CAPTURE_ORDER = ['DEVICE'] OTHER_ORDER = [] - def __init__(self, data, menu_height): - Menu.__init__(self, data, menu_height) + def __init__(self, data, message_handler, menu_height): + Menu.__init__(self, data, message_handler, menu_height) self.generate_settings_list() def generate_settings_list(self): diff --git a/data_centre/json_objects/keypad_action_mapping.json b/json_objects/keypad_action_mapping.json similarity index 100% rename from data_centre/json_objects/keypad_action_mapping.json rename to json_objects/keypad_action_mapping.json diff --git a/data_centre/json_objects/midi_action_mapping.json b/json_objects/midi_action_mapping.json similarity index 100% rename from data_centre/json_objects/midi_action_mapping.json rename to json_objects/midi_action_mapping.json diff --git a/data_centre/json_objects/settings.json b/json_objects/settings_default.json similarity index 95% rename from data_centre/json_objects/settings.json rename to json_objects/settings_default.json index 9af5967..123a32a 100644 --- a/data_centre/json_objects/settings.json +++ b/json_objects/settings_default.json @@ -6,7 +6,7 @@ "enabled", "disabled" ], - "value": "enabled" + "value": "disabled" }, "FRAMERATE": { "action": "update_capture_settings", @@ -78,7 +78,7 @@ "enabled", "disabled" ], - "value": "enabled" + "value": "disabled" }, "STATUS": { "action": null, @@ -93,7 +93,7 @@ "on", "off" ], - "value": "on" + "value": "off" }, "QUIT": { "action": "quit_the_program", @@ -121,7 +121,7 @@ "on", "off" ], - "value": "on" + "value": "off" }, "FIXED_LENGTH_MULTIPLY": { "action": null, @@ -149,7 +149,7 @@ "random", "consecutive" ], - "value": "random" + "value": "now" }, "ON_ACTION": { "action": "update_video_settings", @@ -192,7 +192,7 @@ "on", "off" ], - "value": "on" + "value": "off" } }, "video": { @@ -206,7 +206,7 @@ "green", "none" ], - "value": "none" + "value": "black" }, "COMPOSITE_PROGRESSIVE": { "action": "change_composite_setting", @@ -214,7 +214,7 @@ "off", "on" ], - "value": "on" + "value": "off" }, "COMPOSITE_RATIO": { "action": "change_composite_setting", @@ -223,7 +223,7 @@ "14:9", "16:9" ], - "value": "14:9" + "value": "4:3" }, "COMPOSITE_TYPE": { "action": "change_composite_setting", @@ -231,7 +231,7 @@ "PAL", "NTSC" ], - "value": "NTSC" + "value": "PAL" }, "OUTPUT": { "action": "change_output_mode", @@ -251,4 +251,4 @@ "value": "letterbox" } } -} \ No newline at end of file +} diff --git a/r_e_c_u_r.py b/r_e_c_u_r.py index c1035cd..f6b2136 100644 --- a/r_e_c_u_r.py +++ b/r_e_c_u_r.py @@ -38,6 +38,7 @@ numpad_input = NumpadInput(tk, message_handler, display, actions, data) midi_input = MidiInput(tk, message_handler, display, actions, data) actions.check_and_set_output_mode_on_boot() +actions.check_dev_mode() actions.toggle_x_autorepeat() frame.pack() diff --git a/video_centre/video_player.py b/video_centre/video_player.py index 84af2e9..845145b 100644 --- a/video_centre/video_player.py +++ b/video_centre/video_player.py @@ -8,7 +8,7 @@ class VideoPlayer: self.omx_player = None self.name = name self.omx_running = False - self.status = 'N/A' + self.status = 'EMPTY' self.total_length = 0.0 self.bankslot_number = '*-*' self.start = -1.0 @@ -43,6 +43,9 @@ class VideoPlayer: arguments.append('--blank=0x{}'.format(self.data.get_background_colour())) self.status = 'LOADING' print('the location is {}'.format(self.location)) + if self.location == '': + self.status = 'EMPTY' + return True self.omx_player = OMXPlayer(self.location, args=arguments, dbus_name=self.name) self.omx_running = True self.total_length = self.omx_player.duration() # <-- uneeded once self.duration stores float @@ -167,7 +170,7 @@ class VideoPlayer: def exit(self): try: self.omx_player.quit() - self.status = 'N/A' + self.status = 'EMPTY' self.omx_running = False except: pass