diff options
author | Bryan Bishop <kanzure@gmail.com> | 2013-09-10 20:08:49 -0500 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-10 20:08:49 -0500 |
commit | e47308a1f88f19dfc0ee5cb42dc643a520d9175b (patch) | |
tree | 7ae7bb3ff46ceeab012869db3cbdad86545a0496 /extras/pokered_dir.py | |
parent | a684941cfcf88942cbecaecf997609acc3652a1a (diff) | |
parent | 37c80175368352710e20f752ebfdc1e9e3ac3e2b (diff) |
Merge branch kanzure/master into dannye-incbins
Conflicts:
extras
Diffstat (limited to 'extras/pokered_dir.py')
m--------- | extras | 0 | ||||
-rw-r--r-- | extras/pokered_dir.py | 4 |
2 files changed, 0 insertions, 4 deletions
diff --git a/extras b/extras new file mode 160000 +Subproject 7aa016fb528bcc8dcb30c6a887957851623eccc diff --git a/extras/pokered_dir.py b/extras/pokered_dir.py deleted file mode 100644 index 69137839..00000000 --- a/extras/pokered_dir.py +++ /dev/null @@ -1,4 +0,0 @@ -import os - -#main dir of repo (simply one level up than here) -pokered_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) |