Move everything up a level since the root dir no longer has stuff

Aegisub · Mar 11, 2014 · 33a4a05 · 33a4a05
1 parent bdff48f
commit 33a4a05
Show file tree

Hide file tree

Showing 1,955 changed files with 74 additions and 76 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,49 +34,44 @@
 *.zip
 *~
 
-bin
-lib
-obj
-ipch
+/bin
+/include
+/ipch
+/lib
+/obj
+/tests/data
 
 .lvimrc
 .syntastic_cpp_config
+/Makefile.inc
 BuildLog.htm
-Makefile.inc
 acconf.h
 acconf.h.in
 aclocal.m4
-aegisub/conf.sh
-aegisub/desktop/aegisub.desktop
-aegisub/desktop/aegisub.desktop.template
-aegisub/libaegisub/libaegisub-3.0.so.3
-aegisub/reporter/reporter-3.0
-aegisub/src/aegisub
-aegisub/src/aegisub-3.0
-aegisub/src/libresrc/bitmap.cpp
-aegisub/src/libresrc/bitmap.h
-aegisub/src/libresrc/default_config.cpp
-aegisub/src/libresrc/default_config.h
-aegisub/src/libresrc/default_config_platform.json
-aegisub/tools/common-respack
-aegisub/tools/repack-thes-dict
-aegisub/tools/repack-thes-dict.dSYM
-aegisub/tools/osx-bundle-restart-helper
-aegisub/tools/osx-bundle.sed
 autom4te.cache
+conf.sh
 config.log
 config.status
 config_windows.h
 configure
-svn-revision.h
-svn_revision
-svnmove.txt
+desktop/aegisub.desktop
+desktop/aegisub.desktop.template
 git_version.h
 git_version.xml
-aegisub/tests/data
-aegisub/tests/run
-aegisub/tests/*.json
+src/aegisub
+src/libresrc/bitmap.cpp
+src/libresrc/bitmap.h
+src/libresrc/default_config.cpp
+src/libresrc/default_config.h
+src/libresrc/default_config_platform.json
+svn-revision.h
+svn_revision
+tests/*.json
+tests/run
+tools/common-respack
+tools/osx-bundle-restart-helper
+tools/osx-bundle.sed
+tools/repack-thes-dict
+tools/repack-thes-dict.dSYM
 
-/packages
 .nuget
-/aegisub/include
diff --git a/.gitmodules b/.gitmodules
@@ -1,56 +1,56 @@
 [submodule "aegisub/vendor/fribidi"]
-	path = aegisub/vendor/fribidi
+	path = vendor/fribidi
 	url = git://anongit.freedesktop.org/fribidi/fribidi
 	ignore = dirty
 [submodule "aegisub/vendor/freetype2"]
-	path = aegisub/vendor/freetype2
+	path = vendor/freetype2
 	url = git://git.sv.nongnu.org/freetype/freetype2.git
 	ignore = dirty
 [submodule "aegisub/vendor/zlib"]
-	path = aegisub/vendor/zlib
+	path = vendor/zlib
 	url = git://github.com/madler/zlib.git
 	ignore = dirty
 [submodule "aegisub/vendor/wxWidgets"]
-	path = aegisub/vendor/wxWidgets
+	path = vendor/wxWidgets
 	url = git://github.com/wxWidgets/wxWidgets.git
 	ignore = dirty
 [submodule "aegisub/vendor/googletest"]
-	path = aegisub/vendor/googletest
+	path = vendor/googletest
 	url = git://github.com/svn2github/googletest.git
 	ignore = dirty
 [submodule "aegisub/vendor/ffmpeg"]
-	path = aegisub/vendor/ffmpeg
+	path = vendor/ffmpeg
 	url = git://source.ffmpeg.org/ffmpeg.git
 	ignore = dirty
 [submodule "aegisub/vendor/ffms2"]
-	path = aegisub/vendor/ffms2
+	path = vendor/ffms2
 	url = git://github.com/FFMS/ffms2.git
 	branch = master
 	ignore = dirty
 [submodule "aegisub/vendor/fontconfig"]
-	path = aegisub/vendor/fontconfig
+	path = vendor/fontconfig
 	url = git://github.com/tgoyne/fontconfig.git
 	branch = msvc
 	ignore = dirty
 [submodule "aegisub/vendor/libass"]
-	path = aegisub/vendor/libass
+	path = vendor/libass
 	url = git://github.com/libass/libass.git
 	branch = master
 [submodule "aegisub/vendor/icu"]
-	path = aegisub/vendor/icu
+	path = vendor/icu
 	url = git://github.com/sillsdev/icu4c.git
 	branch = trunk
 	ignore = dirty
 [submodule "aegisub/vendor/boost"]
-	path = aegisub/vendor/boost
+	path = vendor/boost
 	url = https://github.com/boostorg/boost.git
 	ignore = dirty
 [submodule "aegisub/vendor/lua"]
-	path = aegisub/vendor/lua
+	path = vendor/lua
 	url = git://github.com/ittner/Lua-experimentation.git
 	branch = lua51
 	ignore = dirty
 [submodule "aegisub/vendor/fftw"]
-	path = aegisub/vendor/fftw
+	path = vendor/fftw
 	url = https://github.com/Aegisub/fftw3.git
 	ignore = dirty
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
@@ -3,4 +3,7 @@
   <solution>
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
-</configuration>
+  <config>
+    <add key="repositoryPath" value="lib" />
+  </config>
+</configuration>
diff --git a/Aegisub.sln b/Aegisub.sln
@@ -2,56 +2,56 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aegisub", "aegisub\build\Aegisub\Aegisub.vcxproj", "{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aegisub", "build\Aegisub\Aegisub.vcxproj", "{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csrihelper", "aegisub\build\csrihelper\csrihelper.vcxproj", "{C832EAF3-860D-4373-A02C-933626B47A5E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csrihelper", "build\csrihelper\csrihelper.vcxproj", "{C832EAF3-860D-4373-A02C-933626B47A5E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "aegisub\build\hunspell\hunspell.vcxproj", "{CC791693-6B28-40AC-879D-64A6C16468E3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "build\hunspell\hunspell.vcxproj", "{CC791693-6B28-40AC-879D-64A6C16468E3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaegisub", "aegisub\build\libaegisub\libaegisub.vcxproj", "{BB3FED86-DB7A-4DC7-964A-260FB86CDE61}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaegisub", "build\libaegisub\libaegisub.vcxproj", "{BB3FED86-DB7A-4DC7-964A-260FB86CDE61}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "aegisub\build\libiconv\libiconv.vcxproj", "{965054D2-44F2-4EB2-9879-051CC3D7EF08}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "build\libiconv\libiconv.vcxproj", "{965054D2-44F2-4EB2-9879-051CC3D7EF08}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresrc", "aegisub\build\libresrc\libresrc.vcxproj", "{BD00D65F-24DA-4784-8860-3B972EA125FC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresrc", "build\libresrc\libresrc.vcxproj", "{BD00D65F-24DA-4784-8860-3B972EA125FC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC} = {0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}
 		{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8} = {08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "aegisub\build\lua51\lua51.vcxproj", "{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "build\lua51\lua51.vcxproj", "{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "respack", "aegisub\build\respack\respack.vcxproj", "{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "respack", "build\respack\respack.vcxproj", "{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "universalchardet", "aegisub\build\universalchardet\universalchardet.vcxproj", "{7B56955D-5162-4698-AA5B-47484EDC8783}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "universalchardet", "build\universalchardet\universalchardet.vcxproj", "{7B56955D-5162-4698-AA5B-47484EDC8783}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fftw", "aegisub\build\fftw\fftw.vcxproj", "{EA3DCC95-2423-4EA0-A508-7A427B4C0594}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fftw", "build\fftw\fftw.vcxproj", "{EA3DCC95-2423-4EA0-A508-7A427B4C0594}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "aegisub\build\freetype2\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "build\freetype2\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fontconfig", "aegisub\build\fontconfig\fontconfig.vcxproj", "{AD56899E-961B-47B7-BD0F-14D0DA50D141}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fontconfig", "build\fontconfig\fontconfig.vcxproj", "{AD56899E-961B-47B7-BD0F-14D0DA50D141}"
 	ProjectSection(ProjectDependencies) = postProject
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fribidi", "aegisub\build\fribidi\fribidi.vcxproj", "{FB8E8D19-A4D6-4181-943C-282075F49B41}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fribidi", "build\fribidi\fribidi.vcxproj", "{FB8E8D19-A4D6-4181-943C-282075F49B41}"
 	ProjectSection(ProjectDependencies) = postProject
 		{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffms2", "aegisub\build\ffms2\ffms2.vcxproj", "{AA137613-96A1-4388-8905-71345B4F8F87}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffms2", "build\ffms2\ffms2.vcxproj", "{AA137613-96A1-4388-8905-71345B4F8F87}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F934AB7B-186B-4E96-B20C-A58C38C1B819} = {F934AB7B-186B-4E96-B20C-A58C38C1B819}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "aegisub\build\ffmpeg\ffmpeg.vcxproj", "{F934AB7B-186B-4E96-B20C-A58C38C1B819}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "build\ffmpeg\ffmpeg.vcxproj", "{F934AB7B-186B-4E96-B20C-A58C38C1B819}"
 	ProjectSection(ProjectDependencies) = postProject
 		{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE} = {10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "aegisub\build\zlib\zlib.vcxproj", "{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "build\zlib\zlib.vcxproj", "{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CEAEFCB9-3759-4D03-8D51-7287D7B7E7DF}"
 	ProjectSection(SolutionItems) = preProject
@@ -60,27 +60,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CEAEFC
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxWidgets", "aegisub\build\wx\wxWidgets.vcxproj", "{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxWidgets", "build\wx\wxWidgets.vcxproj", "{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libass", "aegisub\build\libass\libass.vcxproj", "{8804F253-DA67-4CC4-926B-0CD2AEE5778D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libass", "build\libass\libass.vcxproj", "{8804F253-DA67-4CC4-926B-0CD2AEE5778D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PortableInstaller", "aegisub\build\PortableInstaller\PortableInstaller.vcxproj", "{5B0E9978-E76F-4BBC-8194-228323F59B53}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PortableInstaller", "build\PortableInstaller\PortableInstaller.vcxproj", "{5B0E9978-E76F-4BBC-8194-228323F59B53}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost", "aegisub\build\boost\boost.vcxproj", "{A649D828-A399-4D81-ADEF-94CFDBA7847F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost", "build\boost\boost.vcxproj", "{A649D828-A399-4D81-ADEF-94CFDBA7847F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "aegisub\build\icu\icu.vcxproj", "{F934AB7B-186B-4E96-B20C-A58C38C1B818}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "build\icu\icu.vcxproj", "{F934AB7B-186B-4E96-B20C-A58C38C1B818}"
 	ProjectSection(ProjectDependencies) = postProject
 		{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googletest", "aegisub\build\googletest\googletest.vcxproj", "{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googletest", "build\googletest\googletest.vcxproj", "{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "aegisub\build\tests\tests.vcxproj", "{49766286-2B5D-4177-A860-BD7CE1846EEF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "build\tests\tests.vcxproj", "{49766286-2B5D-4177-A860-BD7CE1846EEF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildTasks", "aegisub\build\BuildTasks\BuildTasks.csproj", "{914A5B35-66B2-4293-BB6C-D93DA9BC68C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildTasks", "build\BuildTasks\BuildTasks.csproj", "{914A5B35-66B2-4293-BB6C-D93DA9BC68C6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/aegisub/LICENCE → LICENCE b/aegisub/LICENCE → LICENCE
diff --git a/aegisub/Makefile → Makefile b/aegisub/Makefile → Makefile
diff --git a/aegisub/Makefile.inc.in → Makefile.inc.in b/aegisub/Makefile.inc.in → Makefile.inc.in
diff --git a/aegisub/Makefile.target → Makefile.target b/aegisub/Makefile.target → Makefile.target
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Support is available on [the forums](http://forum.aegisub.org) or [on IRC](irc:/
 
 Prerequisites:
 
-1. Visual Studio 2012. Express edition might work.
+1. Visual Studio 2013. Express edition might work.
 2. A recent Windows SDK
 3. A recent DirectX SDK
 4. A MSYS install with git and c99conv. Note that mingw is not required.
@@ -28,14 +28,14 @@ All other dependencies are either stored in the repository or are included as su
 Building:
 
 1. Clone Aegisub's repository recursively to fetch it and all submodules: `git clone --recursive git@github.com:Aegisub/Aegisub.git`
-2. Disable autocrlf for ffmpeg, as its build system manages to not support Windows newlines: `cd aegisub/deps/ffmpeg && git config --local core.autocrlf && git rm --cached -r . && git reset --hard`
+2. Disable autocrlf for ffmpeg, as its build system manages to not support Windows newlines: `cd vendor/ffmpeg && git config --local core.autocrlf && git rm --cached -r . && git reset --hard`
 3. Open Visual Studio from the VS2013 Native Tools Command Promp using devenv.exe /useenv (required for the build system to be able to find nmake.exe for building wxWidgets)
 4. Open Aegisub.sln
 5. Open the properties for the Aegisub project and set the location of MSYS in Configuration Properties > Aegisub > Library paths
 6. Build Aegisub
 7. Copy the contents of an existing Aegisub install into the aegisub/aegisub/bin directory (not strictly required, but you'll be missing a lot of functionality otherwise).
 
-There's a pile of other files such as dictionaries, VSFilter and avisynth 
+There's a pile of other files needed at runtime such as dictionaries, VSFilter and avisynth. The simplest way to get them is to copy all of the files from the Aegisub installer to the bin directory.
 
 For actual development work you will probably want to mostly use the
 "Debug-MinDep" configuration (which disables building most of the projects), as

diff --git a/aegisub/acinclude.m4 → acinclude.m4 b/aegisub/acinclude.m4 → acinclude.m4
diff --git a/aegisub/autogen.sh → autogen.sh b/aegisub/autogen.sh → autogen.sh
diff --git a/aegisub/automation/.gitignore → automation/.gitignore b/aegisub/automation/.gitignore → automation/.gitignore
diff --git a/aegisub/automation/Makefile → automation/Makefile b/aegisub/automation/Makefile → automation/Makefile
diff --git a/aegisub/automation/autoload/clean-info.lua → automation/autoload/clean-info.lua b/aegisub/automation/autoload/clean-info.lua → automation/autoload/clean-info.lua
diff --git a/...utomation/autoload/cleantags-autoload.lua → automation/autoload/cleantags-autoload.lua b/...utomation/autoload/cleantags-autoload.lua → automation/autoload/cleantags-autoload.lua
diff --git a/...ub/automation/autoload/kara-templater.lua → automation/autoload/kara-templater.lua b/...ub/automation/autoload/kara-templater.lua → automation/autoload/kara-templater.lua
diff --git a/...tomation/autoload/karaoke-auto-leadin.lua → automation/autoload/karaoke-auto-leadin.lua b/...tomation/autoload/karaoke-auto-leadin.lua → automation/autoload/karaoke-auto-leadin.lua
diff --git a/.../automation/autoload/macro-1-edgeblur.lua → automation/autoload/macro-1-edgeblur.lua b/.../automation/autoload/macro-1-edgeblur.lua → automation/autoload/macro-1-edgeblur.lua
diff --git a/...tomation/autoload/macro-2-mkfullwitdh.lua → automation/autoload/macro-2-mkfullwitdh.lua b/...tomation/autoload/macro-2-mkfullwitdh.lua → automation/autoload/macro-2-mkfullwitdh.lua
diff --git a/.../automation/autoload/select-overlaps.moon → automation/autoload/select-overlaps.moon b/.../automation/autoload/select-overlaps.moon → automation/autoload/select-overlaps.moon
diff --git a/aegisub/automation/autoload/strip-tags.lua → automation/autoload/strip-tags.lua b/aegisub/automation/autoload/strip-tags.lua → automation/autoload/strip-tags.lua
diff --git a/...ub/automation/demos/future-windy-blur.lua → automation/demos/future-windy-blur.lua b/...ub/automation/demos/future-windy-blur.lua → automation/demos/future-windy-blur.lua
diff --git a/aegisub/automation/demos/raytracer-test1.ass → automation/demos/raytracer-test1.ass b/aegisub/automation/demos/raytracer-test1.ass → automation/demos/raytracer-test1.ass
diff --git a/aegisub/automation/demos/raytracer.lua → automation/demos/raytracer.lua b/aegisub/automation/demos/raytracer.lua → automation/demos/raytracer.lua
diff --git a/.../automation/include/aegisub/clipboard.lua → automation/include/aegisub/clipboard.lua b/.../automation/include/aegisub/clipboard.lua → automation/include/aegisub/clipboard.lua
diff --git a/aegisub/automation/include/aegisub/re.moon → automation/include/aegisub/re.moon b/aegisub/automation/include/aegisub/re.moon → automation/include/aegisub/re.moon
diff --git a/...b/automation/include/aegisub/unicode.moon → automation/include/aegisub/unicode.moon b/...b/automation/include/aegisub/unicode.moon → automation/include/aegisub/unicode.moon
diff --git a/aegisub/automation/include/aegisub/util.moon → automation/include/aegisub/util.moon b/aegisub/automation/include/aegisub/util.moon → automation/include/aegisub/util.moon
diff --git a/aegisub/automation/include/cleantags.lua → automation/include/cleantags.lua b/aegisub/automation/include/cleantags.lua → automation/include/cleantags.lua
diff --git a/aegisub/automation/include/clipboard.lua → automation/include/clipboard.lua b/aegisub/automation/include/clipboard.lua → automation/include/clipboard.lua
diff --git a/...sub/automation/include/karaskel-auto4.lua → automation/include/karaskel-auto4.lua b/...sub/automation/include/karaskel-auto4.lua → automation/include/karaskel-auto4.lua
diff --git a/aegisub/automation/include/karaskel.lua → automation/include/karaskel.lua b/aegisub/automation/include/karaskel.lua → automation/include/karaskel.lua
diff --git a/aegisub/automation/include/moonscript.lua → automation/include/moonscript.lua b/aegisub/automation/include/moonscript.lua → automation/include/moonscript.lua
diff --git a/aegisub/automation/include/re.lua → automation/include/re.lua b/aegisub/automation/include/re.lua → automation/include/re.lua
diff --git a/aegisub/automation/include/unicode.lua → automation/include/unicode.lua b/aegisub/automation/include/unicode.lua → automation/include/unicode.lua
diff --git a/aegisub/automation/include/utils-auto4.lua → automation/include/utils-auto4.lua b/aegisub/automation/include/utils-auto4.lua → automation/include/utils-auto4.lua
diff --git a/aegisub/automation/include/utils.lua → automation/include/utils.lua b/aegisub/automation/include/utils.lua → automation/include/utils.lua
diff --git a/aegisub/automation/tests/aegisub.cpp → automation/tests/aegisub.cpp b/aegisub/automation/tests/aegisub.cpp → automation/tests/aegisub.cpp
diff --git a/...ation/tests/automation/appended-lines.lua → ...ation/tests/automation/appended-lines.lua b/...ation/tests/automation/appended-lines.lua → ...ation/tests/automation/appended-lines.lua
diff --git a/...on/tests/automation/basic-export-test.lua → ...on/tests/automation/basic-export-test.lua b/...on/tests/automation/basic-export-test.lua → ...on/tests/automation/basic-export-test.lua
diff --git a/...tomation/tests/automation/basic-tests.lua → automation/tests/automation/basic-tests.lua b/...tomation/tests/automation/basic-tests.lua → automation/tests/automation/basic-tests.lua
diff --git a/...n/tests/automation/config-dialog-test.lua → ...n/tests/automation/config-dialog-test.lua b/...n/tests/automation/config-dialog-test.lua → ...n/tests/automation/config-dialog-test.lua
diff --git a/...automation/tests/automation/furi-test.ass → automation/tests/automation/furi-test.ass b/...automation/tests/automation/furi-test.ass → automation/tests/automation/furi-test.ass
diff --git a/...on/tests/automation/gen-absurd-t-line.lua → ...on/tests/automation/gen-absurd-t-line.lua b/...on/tests/automation/gen-absurd-t-line.lua → ...on/tests/automation/gen-absurd-t-line.lua
diff --git a/...tomation/tests/automation/hello-world.lua → automation/tests/automation/hello-world.lua b/...tomation/tests/automation/hello-world.lua → automation/tests/automation/hello-world.lua
diff --git a/...ests/automation/kara-templater-retime.ass → ...ests/automation/kara-templater-retime.ass b/...ests/automation/kara-templater-retime.ass → ...ests/automation/kara-templater-retime.ass
diff --git a/...n/tests/automation/karaoke-parse-test.lua → ...n/tests/automation/karaoke-parse-test.lua b/...n/tests/automation/karaoke-parse-test.lua → ...n/tests/automation/karaoke-parse-test.lua
diff --git a/...ts/automation/progress-reporting-test.lua → ...ts/automation/progress-reporting-test.lua b/...ts/automation/progress-reporting-test.lua → ...ts/automation/progress-reporting-test.lua
diff --git a/...n/tests/automation/selection-set-test.lua → ...n/tests/automation/selection-set-test.lua b/...n/tests/automation/selection-set-test.lua → ...n/tests/automation/selection-set-test.lua
diff --git a/...sts/automation/test-filter-name-clash.lua → ...sts/automation/test-filter-name-clash.lua b/...sts/automation/test-filter-name-clash.lua → ...sts/automation/test-filter-name-clash.lua
diff --git a/...automation/tests/automation/test-furi.lua → automation/tests/automation/test-furi.lua b/...automation/tests/automation/test-furi.lua → automation/tests/automation/test-furi.lua
diff --git a/...s/automation/test-tablecopy-recursive.lua → ...s/automation/test-tablecopy-recursive.lua b/...s/automation/test-tablecopy-recursive.lua → ...s/automation/test-tablecopy-recursive.lua
diff --git a/...on/tests/automation/test-text_extents.lua → ...on/tests/automation/test-text_extents.lua b/...on/tests/automation/test-text_extents.lua → ...on/tests/automation/test-text_extents.lua
diff --git a/...on/tests/automation/text-extents-test.lua → ...on/tests/automation/text-extents-test.lua b/...on/tests/automation/text-extents-test.lua → ...on/tests/automation/text-extents-test.lua
diff --git a/...ion/tests/automation/trace-level-test.lua → ...ion/tests/automation/trace-level-test.lua b/...ion/tests/automation/trace-level-test.lua → ...ion/tests/automation/trace-level-test.lua
diff --git a/...omation/tests/automation/unicode-test.lua → automation/tests/automation/unicode-test.lua b/...omation/tests/automation/unicode-test.lua → automation/tests/automation/unicode-test.lua
diff --git a/aegisub/automation/tests/modules/re.moon → automation/tests/modules/re.moon b/aegisub/automation/tests/modules/re.moon → automation/tests/modules/re.moon
diff --git a/...sub/automation/tests/modules/unicode.moon → automation/tests/modules/unicode.moon b/...sub/automation/tests/modules/unicode.moon → automation/tests/modules/unicode.moon
diff --git a/aegisub/automation/tests/runner.moon → automation/tests/runner.moon b/aegisub/automation/tests/runner.moon → automation/tests/runner.moon
diff --git a/...tion/v4-docs/basic-function-interface.txt → ...tion/v4-docs/basic-function-interface.txt b/...tion/v4-docs/basic-function-interface.txt → ...tion/v4-docs/basic-function-interface.txt
diff --git a/...omation/v4-docs/configuration-dialogs.txt → automation/v4-docs/configuration-dialogs.txt b/...omation/v4-docs/configuration-dialogs.txt → automation/v4-docs/configuration-dialogs.txt
diff --git a/aegisub/automation/v4-docs/file-streams.txt → automation/v4-docs/file-streams.txt b/aegisub/automation/v4-docs/file-streams.txt → automation/v4-docs/file-streams.txt
diff --git a/aegisub/automation/v4-docs/misc.txt → automation/v4-docs/misc.txt b/aegisub/automation/v4-docs/misc.txt → automation/v4-docs/misc.txt
diff --git a/aegisub/automation/v4-docs/overview.txt → automation/v4-docs/overview.txt b/aegisub/automation/v4-docs/overview.txt → automation/v4-docs/overview.txt
diff --git a/...automation/v4-docs/progress-reporting.txt → automation/v4-docs/progress-reporting.txt b/...automation/v4-docs/progress-reporting.txt → automation/v4-docs/progress-reporting.txt
diff --git a/aegisub/automation/v4-docs/subtitle-data.txt → automation/v4-docs/subtitle-data.txt b/aegisub/automation/v4-docs/subtitle-data.txt → automation/v4-docs/subtitle-data.txt
diff --git a/...tion/v4-docs/template-scripting-ideas.ass → ...tion/v4-docs/template-scripting-ideas.ass b/...tion/v4-docs/template-scripting-ideas.ass → ...tion/v4-docs/template-scripting-ideas.ass
diff --git a/aegisub/build/Aegisub/Aegisub.targets → build/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets → build/Aegisub/Aegisub.targets
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj → build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj → build/Aegisub/Aegisub.vcxproj
@@ -34,7 +34,7 @@
       Command="$(MSBuildThisFileDirectory)..\version.sh"
       WorkingDirectory="$(AegisubSourceBase)"
       Configuration="@(ExecShellScript)"
-      Arguments=".." />
+      Arguments="." />
   </Target>
 
   <!-- Project References -->

diff --git a/...sub/build/Aegisub/Aegisub.vcxproj.filters → build/Aegisub/Aegisub.vcxproj.filters b/...sub/build/Aegisub/Aegisub.vcxproj.filters → build/Aegisub/Aegisub.vcxproj.filters
diff --git a/aegisub/build/Aegisub/Aegisub.xml → build/Aegisub/Aegisub.xml b/aegisub/build/Aegisub/Aegisub.xml → build/Aegisub/Aegisub.xml
diff --git a/...ub/build/Aegisub/standard-libraries.props → build/Aegisub/standard-libraries.props b/...ub/build/Aegisub/standard-libraries.props → build/Aegisub/standard-libraries.props
diff --git a/aegisub/build/BuildTasks/BuildTasks.csproj → build/BuildTasks/BuildTasks.csproj b/aegisub/build/BuildTasks/BuildTasks.csproj → build/BuildTasks/BuildTasks.csproj
@@ -35,7 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\..\.nuget\lib\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Build" />
     <Reference Include="Microsoft.Build.Engine" />
@@ -70,4 +70,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/aegisub/build/BuildTasks/DownloadTgzFile.cs → build/BuildTasks/DownloadTgzFile.cs b/aegisub/build/BuildTasks/DownloadTgzFile.cs → build/BuildTasks/DownloadTgzFile.cs
diff --git a/aegisub/build/BuildTasks/ExecShellScript.cs → build/BuildTasks/ExecShellScript.cs b/aegisub/build/BuildTasks/ExecShellScript.cs → build/BuildTasks/ExecShellScript.cs
diff --git a/aegisub/build/BuildTasks/MsysPath.cs → build/BuildTasks/MsysPath.cs b/aegisub/build/BuildTasks/MsysPath.cs → build/BuildTasks/MsysPath.cs
diff --git a/...ild/BuildTasks/Properties/AssemblyInfo.cs → build/BuildTasks/Properties/AssemblyInfo.cs b/...ild/BuildTasks/Properties/AssemblyInfo.cs → build/BuildTasks/Properties/AssemblyInfo.cs
diff --git a/aegisub/build/BuildTasks/ShellWrapper.cs → build/BuildTasks/ShellWrapper.cs b/aegisub/build/BuildTasks/ShellWrapper.cs → build/BuildTasks/ShellWrapper.cs
diff --git a/aegisub/build/BuildTasks/UpdateFile.cs → build/BuildTasks/UpdateFile.cs b/aegisub/build/BuildTasks/UpdateFile.cs → build/BuildTasks/UpdateFile.cs
diff --git a/aegisub/build/BuildTasks/Utils.cs → build/BuildTasks/Utils.cs b/aegisub/build/BuildTasks/Utils.cs → build/BuildTasks/Utils.cs
diff --git a/aegisub/build/BuildTasks/packages.config → build/BuildTasks/packages.config b/aegisub/build/BuildTasks/packages.config → build/BuildTasks/packages.config
diff --git a/aegisub/build/DefaultConfiguration.props → build/DefaultConfiguration.props b/aegisub/build/DefaultConfiguration.props → build/DefaultConfiguration.props
diff --git a/...rtableInstaller/PortableInstaller.vcxproj → ...rtableInstaller/PortableInstaller.vcxproj b/...rtableInstaller/PortableInstaller.vcxproj → ...rtableInstaller/PortableInstaller.vcxproj
diff --git a/...staller/PortableInstaller.vcxproj.filters → ...staller/PortableInstaller.vcxproj.filters b/...staller/PortableInstaller.vcxproj.filters → ...staller/PortableInstaller.vcxproj.filters
diff --git a/aegisub/build/aegisub.props → build/aegisub.props b/aegisub/build/aegisub.props → build/aegisub.props
diff --git a/aegisub/build/boost/boost.vcxproj → build/boost/boost.vcxproj b/aegisub/build/boost/boost.vcxproj → build/boost/boost.vcxproj
diff --git a/aegisub/build/boost/boost.vcxproj.filters → build/boost/boost.vcxproj.filters b/aegisub/build/boost/boost.vcxproj.filters → build/boost/boost.vcxproj.filters
diff --git a/aegisub/build/csrihelper/csrihelper.vcxproj → build/csrihelper/csrihelper.vcxproj b/aegisub/build/csrihelper/csrihelper.vcxproj → build/csrihelper/csrihelper.vcxproj
diff --git a/...ild/csrihelper/csrihelper.vcxproj.filters → build/csrihelper/csrihelper.vcxproj.filters b/...ild/csrihelper/csrihelper.vcxproj.filters → build/csrihelper/csrihelper.vcxproj.filters
diff --git a/aegisub/build/ffmpeg/ffmpeg.vcxproj → build/ffmpeg/ffmpeg.vcxproj b/aegisub/build/ffmpeg/ffmpeg.vcxproj → build/ffmpeg/ffmpeg.vcxproj
diff --git a/aegisub/build/ffmpeg/ffmpeg.vcxproj.filters → build/ffmpeg/ffmpeg.vcxproj.filters b/aegisub/build/ffmpeg/ffmpeg.vcxproj.filters → build/ffmpeg/ffmpeg.vcxproj.filters
diff --git a/aegisub/build/ffms2/ffms2.vcxproj → build/ffms2/ffms2.vcxproj b/aegisub/build/ffms2/ffms2.vcxproj → build/ffms2/ffms2.vcxproj
diff --git a/aegisub/build/fftw/config.h → build/fftw/config.h b/aegisub/build/fftw/config.h → build/fftw/config.h
diff --git a/aegisub/build/fftw/fftw.vcxproj → build/fftw/fftw.vcxproj b/aegisub/build/fftw/fftw.vcxproj → build/fftw/fftw.vcxproj
diff --git a/aegisub/build/fftw/fftw.vcxproj.filters → build/fftw/fftw.vcxproj.filters b/aegisub/build/fftw/fftw.vcxproj.filters → build/fftw/fftw.vcxproj.filters
diff --git a/aegisub/build/fontconfig/fontconfig.vcxproj → build/fontconfig/fontconfig.vcxproj b/aegisub/build/fontconfig/fontconfig.vcxproj → build/fontconfig/fontconfig.vcxproj
diff --git a/...ild/fontconfig/fontconfig.vcxproj.filters → build/fontconfig/fontconfig.vcxproj.filters b/...ild/fontconfig/fontconfig.vcxproj.filters → build/fontconfig/fontconfig.vcxproj.filters
diff --git a/aegisub/build/freetype2/freetype.vcxproj → build/freetype2/freetype.vcxproj b/aegisub/build/freetype2/freetype.vcxproj → build/freetype2/freetype.vcxproj
diff --git a/.../build/freetype2/freetype.vcxproj.filters → build/freetype2/freetype.vcxproj.filters b/.../build/freetype2/freetype.vcxproj.filters → build/freetype2/freetype.vcxproj.filters
diff --git a/aegisub/build/fribidi/fribidi.vcxproj → build/fribidi/fribidi.vcxproj b/aegisub/build/fribidi/fribidi.vcxproj → build/fribidi/fribidi.vcxproj
diff --git a/...sub/build/fribidi/fribidi.vcxproj.filters → build/fribidi/fribidi.vcxproj.filters b/...sub/build/fribidi/fribidi.vcxproj.filters → build/fribidi/fribidi.vcxproj.filters
diff --git a/aegisub/build/googletest/googletest.vcxproj → build/googletest/googletest.vcxproj b/aegisub/build/googletest/googletest.vcxproj → build/googletest/googletest.vcxproj
diff --git a/...ild/googletest/googletest.vcxproj.filters → build/googletest/googletest.vcxproj.filters b/...ild/googletest/googletest.vcxproj.filters → build/googletest/googletest.vcxproj.filters
diff --git a/aegisub/build/hunspell/hunspell.vcxproj → build/hunspell/hunspell.vcxproj b/aegisub/build/hunspell/hunspell.vcxproj → build/hunspell/hunspell.vcxproj
diff --git a/...b/build/hunspell/hunspell.vcxproj.filters → build/hunspell/hunspell.vcxproj.filters b/...b/build/hunspell/hunspell.vcxproj.filters → build/hunspell/hunspell.vcxproj.filters
diff --git a/aegisub/build/icu/icu.vcxproj → build/icu/icu.vcxproj b/aegisub/build/icu/icu.vcxproj → build/icu/icu.vcxproj
diff --git a/aegisub/build/icu/mh-msys-msvc → build/icu/mh-msys-msvc b/aegisub/build/icu/mh-msys-msvc → build/icu/mh-msys-msvc
diff --git a/aegisub/build/install.targets → build/install.targets b/aegisub/build/install.targets → build/install.targets
diff --git a/aegisub/build/libaegisub/libaegisub.vcxproj → build/libaegisub/libaegisub.vcxproj b/aegisub/build/libaegisub/libaegisub.vcxproj → build/libaegisub/libaegisub.vcxproj
diff --git a/...ild/libaegisub/libaegisub.vcxproj.filters → build/libaegisub/libaegisub.vcxproj.filters b/...ild/libaegisub/libaegisub.vcxproj.filters → build/libaegisub/libaegisub.vcxproj.filters
diff --git a/aegisub/build/libass/config.h → build/libass/config.h b/aegisub/build/libass/config.h → build/libass/config.h
diff --git a/aegisub/build/libass/libass.vcxproj → build/libass/libass.vcxproj b/aegisub/build/libass/libass.vcxproj → build/libass/libass.vcxproj
diff --git a/aegisub/build/libass/libass.vcxproj.filters → build/libass/libass.vcxproj.filters b/aegisub/build/libass/libass.vcxproj.filters → build/libass/libass.vcxproj.filters
diff --git a/aegisub/build/libass/strings.h → build/libass/strings.h b/aegisub/build/libass/strings.h → build/libass/strings.h
diff --git a/aegisub/build/libass/unistd.h → build/libass/unistd.h b/aegisub/build/libass/unistd.h → build/libass/unistd.h
diff --git a/aegisub/build/libiconv/libiconv.vcxproj → build/libiconv/libiconv.vcxproj b/aegisub/build/libiconv/libiconv.vcxproj → build/libiconv/libiconv.vcxproj
diff --git a/...b/build/libiconv/libiconv.vcxproj.filters → build/libiconv/libiconv.vcxproj.filters b/...b/build/libiconv/libiconv.vcxproj.filters → build/libiconv/libiconv.vcxproj.filters
diff --git a/aegisub/build/libresrc/libresrc.vcxproj → build/libresrc/libresrc.vcxproj b/aegisub/build/libresrc/libresrc.vcxproj → build/libresrc/libresrc.vcxproj
diff --git a/...b/build/libresrc/libresrc.vcxproj.filters → build/libresrc/libresrc.vcxproj.filters b/...b/build/libresrc/libresrc.vcxproj.filters → build/libresrc/libresrc.vcxproj.filters
diff --git a/aegisub/build/lua51/lua51.vcxproj → build/lua51/lua51.vcxproj b/aegisub/build/lua51/lua51.vcxproj → build/lua51/lua51.vcxproj
diff --git a/aegisub/build/lua51/lua51.vcxproj.filters → build/lua51/lua51.vcxproj.filters b/aegisub/build/lua51/lua51.vcxproj.filters → build/lua51/lua51.vcxproj.filters
diff --git a/aegisub/build/paths.props → build/paths.props b/aegisub/build/paths.props → build/paths.props
diff --git a/.../respack/Aegisub.ResPack.ProjectItems.xml → .../respack/Aegisub.ResPack.ProjectItems.xml b/.../respack/Aegisub.ResPack.ProjectItems.xml → .../respack/Aegisub.ResPack.ProjectItems.xml
diff --git a/...sub/build/respack/Aegisub.ResPack.targets → build/respack/Aegisub.ResPack.targets b/...sub/build/respack/Aegisub.ResPack.targets → build/respack/Aegisub.ResPack.targets
diff --git a/aegisub/build/respack/Aegisub.ResPack.xml → build/respack/Aegisub.ResPack.xml b/aegisub/build/respack/Aegisub.ResPack.xml → build/respack/Aegisub.ResPack.xml
diff --git a/aegisub/build/respack/respack.vcxproj → build/respack/respack.vcxproj b/aegisub/build/respack/respack.vcxproj → build/respack/respack.vcxproj
diff --git a/...sub/build/respack/respack.vcxproj.filters → build/respack/respack.vcxproj.filters b/...sub/build/respack/respack.vcxproj.filters → build/respack/respack.vcxproj.filters
diff --git a/aegisub/build/standard-outdirs.props → build/standard-outdirs.props b/aegisub/build/standard-outdirs.props → build/standard-outdirs.props
diff --git a/aegisub/build/standard-settings.props → build/standard-settings.props b/aegisub/build/standard-settings.props → build/standard-settings.props
diff --git a/aegisub/build/tasks.props → build/tasks.props b/aegisub/build/tasks.props → build/tasks.props
diff --git a/aegisub/build/tests/tests.vcxproj → build/tests/tests.vcxproj b/aegisub/build/tests/tests.vcxproj → build/tests/tests.vcxproj
diff --git a/aegisub/build/tests/tests.vcxproj.filters → build/tests/tests.vcxproj.filters b/aegisub/build/tests/tests.vcxproj.filters → build/tests/tests.vcxproj.filters
diff --git a/...universalchardet/universalchardet.vcxproj → ...universalchardet/universalchardet.vcxproj b/...universalchardet/universalchardet.vcxproj → ...universalchardet/universalchardet.vcxproj
diff --git a/...lchardet/universalchardet.vcxproj.filters → ...lchardet/universalchardet.vcxproj.filters b/...lchardet/universalchardet.vcxproj.filters → ...lchardet/universalchardet.vcxproj.filters
diff --git a/aegisub/build/userconfig/ft2.props.sample → build/userconfig/ft2.props.sample b/aegisub/build/userconfig/ft2.props.sample → build/userconfig/ft2.props.sample
diff --git a/aegisub/build/userconfig/paths.props.sample → build/userconfig/paths.props.sample b/aegisub/build/userconfig/paths.props.sample → build/userconfig/paths.props.sample
diff --git a/aegisub/build/userconfig/readme.txt → build/userconfig/readme.txt b/aegisub/build/userconfig/readme.txt → build/userconfig/readme.txt
diff --git a/aegisub/build/userconfig/wx.props.sample → build/userconfig/wx.props.sample b/aegisub/build/userconfig/wx.props.sample → build/userconfig/wx.props.sample
diff --git a/aegisub/build/version.sh → build/version.sh b/aegisub/build/version.sh → build/version.sh
@@ -2,7 +2,7 @@ srcdir="$1"
 
 # If no git repo try to read from the existing git_version.h, for building from tarballs
 if ! test -d "${srcdir}/.git"; then
-  version_h_path="${srcdir}/aegisub/build/git_version.h"
+  version_h_path="${srcdir}/build/git_version.h"
   if test -f "${version_h_path}"; then
     while read line; do
       set -- $line

diff --git a/aegisub/build/wx/setup-build.h → build/wx/setup-build.h b/aegisub/build/wx/setup-build.h → build/wx/setup-build.h
diff --git a/aegisub/build/wx/setup-installed.h → build/wx/setup-installed.h b/aegisub/build/wx/setup-installed.h → build/wx/setup-installed.h
diff --git a/aegisub/build/wx/wxWidgets.vcxproj → build/wx/wxWidgets.vcxproj b/aegisub/build/wx/wxWidgets.vcxproj → build/wx/wxWidgets.vcxproj
diff --git a/aegisub/build/zlib/zconf.h → build/zlib/zconf.h b/aegisub/build/zlib/zconf.h → build/zlib/zconf.h
diff --git a/aegisub/build/zlib/zlib.vcxproj → build/zlib/zlib.vcxproj b/aegisub/build/zlib/zlib.vcxproj → build/zlib/zlib.vcxproj
diff --git a/aegisub/config.guess → config.guess b/aegisub/config.guess → config.guess
diff --git a/aegisub/config.sub → config.sub b/aegisub/config.sub → config.sub
diff --git a/aegisub/configure.ac → configure.ac b/aegisub/configure.ac → configure.ac
@@ -125,7 +125,7 @@ PKG_PROG_PKG_CONFIG([pkgconfig_required_version])
 # Developers only
 #################
 AC_MSG_CHECKING([for version])
-. $srcdir/build/version.sh "$srcdir/.."
+. $srcdir/build/version.sh "$srcdir"
 AC_MSG_RESULT([$BUILD_GIT_VERSION_STRING $VERSION_SOURCE])
 
 AC_MSG_CHECKING([for build date])

diff --git a/aegisub/desktop/16x16/apps/aegisub.png → desktop/16x16/apps/aegisub.png b/aegisub/desktop/16x16/apps/aegisub.png → desktop/16x16/apps/aegisub.png
diff --git a/aegisub/desktop/22x22/apps/aegisub.png → desktop/22x22/apps/aegisub.png b/aegisub/desktop/22x22/apps/aegisub.png → desktop/22x22/apps/aegisub.png
diff --git a/aegisub/desktop/24x24/apps/aegisub.png → desktop/24x24/apps/aegisub.png b/aegisub/desktop/24x24/apps/aegisub.png → desktop/24x24/apps/aegisub.png
diff --git a/aegisub/desktop/32x32/apps/aegisub.png → desktop/32x32/apps/aegisub.png b/aegisub/desktop/32x32/apps/aegisub.png → desktop/32x32/apps/aegisub.png
diff --git a/aegisub/desktop/48x48/apps/aegisub.png → desktop/48x48/apps/aegisub.png b/aegisub/desktop/48x48/apps/aegisub.png → desktop/48x48/apps/aegisub.png
diff --git a/aegisub/desktop/64x64/apps/aegisub.png → desktop/64x64/apps/aegisub.png b/aegisub/desktop/64x64/apps/aegisub.png → desktop/64x64/apps/aegisub.png
diff --git a/aegisub/desktop/Makefile → desktop/Makefile b/aegisub/desktop/Makefile → desktop/Makefile
diff --git a/aegisub/desktop/aegisub.desktop.template.in → desktop/aegisub.desktop.template.in b/aegisub/desktop/aegisub.desktop.template.in → desktop/aegisub.desktop.template.in
diff --git a/aegisub/desktop/scalable/apps/aegisub.svg → desktop/scalable/apps/aegisub.svg b/aegisub/desktop/scalable/apps/aegisub.svg → desktop/scalable/apps/aegisub.svg
diff --git a/aegisub/install-sh → install-sh b/aegisub/install-sh → install-sh
diff --git a/aegisub/libaegisub/Makefile → libaegisub/Makefile b/aegisub/libaegisub/Makefile → libaegisub/Makefile
diff --git a/aegisub/libaegisub/ass/dialogue_parser.cpp → libaegisub/ass/dialogue_parser.cpp b/aegisub/libaegisub/ass/dialogue_parser.cpp → libaegisub/ass/dialogue_parser.cpp
diff --git a/aegisub/libaegisub/ass/uuencode.cpp → libaegisub/ass/uuencode.cpp b/aegisub/libaegisub/ass/uuencode.cpp → libaegisub/ass/uuencode.cpp
diff --git a/aegisub/libaegisub/common/cajun/elements.cpp → libaegisub/common/cajun/elements.cpp b/aegisub/libaegisub/common/cajun/elements.cpp → libaegisub/common/cajun/elements.cpp
diff --git a/aegisub/libaegisub/common/cajun/reader.cpp → libaegisub/common/cajun/reader.cpp b/aegisub/libaegisub/common/cajun/reader.cpp → libaegisub/common/cajun/reader.cpp
diff --git a/aegisub/libaegisub/common/cajun/writer.cpp → libaegisub/common/cajun/writer.cpp b/aegisub/libaegisub/common/cajun/writer.cpp → libaegisub/common/cajun/writer.cpp
diff --git a/...ub/libaegisub/common/calltip_provider.cpp → libaegisub/common/calltip_provider.cpp b/...ub/libaegisub/common/calltip_provider.cpp → libaegisub/common/calltip_provider.cpp
diff --git a/aegisub/libaegisub/common/charset.cpp → libaegisub/common/charset.cpp b/aegisub/libaegisub/common/charset.cpp → libaegisub/common/charset.cpp
diff --git a/aegisub/libaegisub/common/charset_6937.cpp → libaegisub/common/charset_6937.cpp b/aegisub/libaegisub/common/charset_6937.cpp → libaegisub/common/charset_6937.cpp
diff --git a/aegisub/libaegisub/common/charset_6937.h → libaegisub/common/charset_6937.h b/aegisub/libaegisub/common/charset_6937.h → libaegisub/common/charset_6937.h
diff --git a/aegisub/libaegisub/common/charset_conv.cpp → libaegisub/common/charset_conv.cpp b/aegisub/libaegisub/common/charset_conv.cpp → libaegisub/common/charset_conv.cpp
diff --git a/aegisub/libaegisub/common/color.cpp → libaegisub/common/color.cpp b/aegisub/libaegisub/common/color.cpp → libaegisub/common/color.cpp
diff --git a/aegisub/libaegisub/common/dispatch.cpp → libaegisub/common/dispatch.cpp b/aegisub/libaegisub/common/dispatch.cpp → libaegisub/common/dispatch.cpp
diff --git a/aegisub/libaegisub/common/fs.cpp → libaegisub/common/fs.cpp b/aegisub/libaegisub/common/fs.cpp → libaegisub/common/fs.cpp
diff --git a/aegisub/libaegisub/common/hotkey.cpp → libaegisub/common/hotkey.cpp b/aegisub/libaegisub/common/hotkey.cpp → libaegisub/common/hotkey.cpp
diff --git a/aegisub/libaegisub/common/io.cpp → libaegisub/common/io.cpp b/aegisub/libaegisub/common/io.cpp → libaegisub/common/io.cpp
diff --git a/aegisub/libaegisub/common/json.cpp → libaegisub/common/json.cpp b/aegisub/libaegisub/common/json.cpp → libaegisub/common/json.cpp
diff --git a/aegisub/libaegisub/common/kana_table.cpp → libaegisub/common/kana_table.cpp b/aegisub/libaegisub/common/kana_table.cpp → libaegisub/common/kana_table.cpp
diff --git a/...sub/libaegisub/common/karaoke_matcher.cpp → libaegisub/common/karaoke_matcher.cpp b/...sub/libaegisub/common/karaoke_matcher.cpp → libaegisub/common/karaoke_matcher.cpp
diff --git a/aegisub/libaegisub/common/keyframe.cpp → libaegisub/common/keyframe.cpp b/aegisub/libaegisub/common/keyframe.cpp → libaegisub/common/keyframe.cpp
diff --git a/aegisub/libaegisub/common/log.cpp → libaegisub/common/log.cpp b/aegisub/libaegisub/common/log.cpp → libaegisub/common/log.cpp
diff --git a/aegisub/libaegisub/common/mru.cpp → libaegisub/common/mru.cpp b/aegisub/libaegisub/common/mru.cpp → libaegisub/common/mru.cpp
diff --git a/aegisub/libaegisub/common/option.cpp → libaegisub/common/option.cpp b/aegisub/libaegisub/common/option.cpp → libaegisub/common/option.cpp
diff --git a/aegisub/libaegisub/common/option_visit.cpp → libaegisub/common/option_visit.cpp b/aegisub/libaegisub/common/option_visit.cpp → libaegisub/common/option_visit.cpp
diff --git a/aegisub/libaegisub/common/option_visit.h → libaegisub/common/option_visit.h b/aegisub/libaegisub/common/option_visit.h → libaegisub/common/option_visit.h
diff --git a/aegisub/libaegisub/common/parser.cpp → libaegisub/common/parser.cpp b/aegisub/libaegisub/common/parser.cpp → libaegisub/common/parser.cpp
diff --git a/aegisub/libaegisub/common/parser.h → libaegisub/common/parser.h b/aegisub/libaegisub/common/parser.h → libaegisub/common/parser.h
diff --git a/aegisub/libaegisub/common/path.cpp → libaegisub/common/path.cpp b/aegisub/libaegisub/common/path.cpp → libaegisub/common/path.cpp
diff --git a/aegisub/libaegisub/common/thesaurus.cpp → libaegisub/common/thesaurus.cpp b/aegisub/libaegisub/common/thesaurus.cpp → libaegisub/common/thesaurus.cpp
diff --git a/aegisub/libaegisub/common/util.cpp → libaegisub/common/util.cpp b/aegisub/libaegisub/common/util.cpp → libaegisub/common/util.cpp
diff --git a/aegisub/libaegisub/common/vfr.cpp → libaegisub/common/vfr.cpp b/aegisub/libaegisub/common/vfr.cpp → libaegisub/common/vfr.cpp
diff --git a/aegisub/libaegisub/config.h → libaegisub/config.h b/aegisub/libaegisub/config.h → libaegisub/config.h
diff --git a/...ub/libaegisub/include/libaegisub/access.h → libaegisub/include/libaegisub/access.h b/...ub/libaegisub/include/libaegisub/access.h → libaegisub/include/libaegisub/access.h
diff --git a/...b/include/libaegisub/address_of_adaptor.h → ...b/include/libaegisub/address_of_adaptor.h b/...b/include/libaegisub/address_of_adaptor.h → ...b/include/libaegisub/address_of_adaptor.h
diff --git a/.../include/libaegisub/ass/dialogue_parser.h → .../include/libaegisub/ass/dialogue_parser.h b/.../include/libaegisub/ass/dialogue_parser.h → .../include/libaegisub/ass/dialogue_parser.h
diff --git a/...aegisub/include/libaegisub/ass/uuencode.h → libaegisub/include/libaegisub/ass/uuencode.h b/...aegisub/include/libaegisub/ass/uuencode.h → libaegisub/include/libaegisub/ass/uuencode.h
diff --git a/...ub/include/libaegisub/background_runner.h → ...ub/include/libaegisub/background_runner.h b/...ub/include/libaegisub/background_runner.h → ...ub/include/libaegisub/background_runner.h
diff --git a/...gisub/include/libaegisub/cajun/elements.h → ...gisub/include/libaegisub/cajun/elements.h b/...gisub/include/libaegisub/cajun/elements.h → ...gisub/include/libaegisub/cajun/elements.h
diff --git a/...aegisub/include/libaegisub/cajun/reader.h → libaegisub/include/libaegisub/cajun/reader.h b/...aegisub/include/libaegisub/cajun/reader.h → libaegisub/include/libaegisub/cajun/reader.h
diff --git a/...egisub/include/libaegisub/cajun/visitor.h → ...egisub/include/libaegisub/cajun/visitor.h b/...egisub/include/libaegisub/cajun/visitor.h → ...egisub/include/libaegisub/cajun/visitor.h
diff --git a/...aegisub/include/libaegisub/cajun/writer.h → libaegisub/include/libaegisub/cajun/writer.h b/...aegisub/include/libaegisub/cajun/writer.h → libaegisub/include/libaegisub/cajun/writer.h
diff --git a/...sub/include/libaegisub/calltip_provider.h → ...sub/include/libaegisub/calltip_provider.h b/...sub/include/libaegisub/calltip_provider.h → ...sub/include/libaegisub/calltip_provider.h
diff --git a/...b/libaegisub/include/libaegisub/charset.h → libaegisub/include/libaegisub/charset.h b/...b/libaegisub/include/libaegisub/charset.h → libaegisub/include/libaegisub/charset.h
diff --git a/...aegisub/include/libaegisub/charset_conv.h → libaegisub/include/libaegisub/charset_conv.h b/...aegisub/include/libaegisub/charset_conv.h → libaegisub/include/libaegisub/charset_conv.h
diff --git a/...sub/include/libaegisub/charset_conv_win.h → ...sub/include/libaegisub/charset_conv_win.h b/...sub/include/libaegisub/charset_conv_win.h → ...sub/include/libaegisub/charset_conv_win.h
diff --git a/...ibaegisub/include/libaegisub/charsets.def → libaegisub/include/libaegisub/charsets.def b/...ibaegisub/include/libaegisub/charsets.def → libaegisub/include/libaegisub/charsets.def
diff --git a/...sub/libaegisub/include/libaegisub/color.h → libaegisub/include/libaegisub/color.h b/...sub/libaegisub/include/libaegisub/color.h → libaegisub/include/libaegisub/color.h
diff --git a/.../libaegisub/include/libaegisub/dispatch.h → libaegisub/include/libaegisub/dispatch.h b/.../libaegisub/include/libaegisub/dispatch.h → libaegisub/include/libaegisub/dispatch.h
diff --git a/...libaegisub/include/libaegisub/exception.h → libaegisub/include/libaegisub/exception.h b/...libaegisub/include/libaegisub/exception.h → libaegisub/include/libaegisub/exception.h
diff --git a/aegisub/libaegisub/include/libaegisub/fs.h → libaegisub/include/libaegisub/fs.h b/aegisub/libaegisub/include/libaegisub/fs.h → libaegisub/include/libaegisub/fs.h
diff --git a/...ub/libaegisub/include/libaegisub/fs_fwd.h → libaegisub/include/libaegisub/fs_fwd.h b/...ub/libaegisub/include/libaegisub/fs_fwd.h → libaegisub/include/libaegisub/fs_fwd.h
diff --git a/...ub/libaegisub/include/libaegisub/hotkey.h → libaegisub/include/libaegisub/hotkey.h b/...ub/libaegisub/include/libaegisub/hotkey.h → libaegisub/include/libaegisub/hotkey.h
diff --git a/aegisub/libaegisub/include/libaegisub/io.h → libaegisub/include/libaegisub/io.h b/aegisub/libaegisub/include/libaegisub/io.h → libaegisub/include/libaegisub/io.h
diff --git a/aegisub/libaegisub/include/libaegisub/json.h → libaegisub/include/libaegisub/json.h b/aegisub/libaegisub/include/libaegisub/json.h → libaegisub/include/libaegisub/json.h
diff --git a/...ibaegisub/include/libaegisub/kana_table.h → libaegisub/include/libaegisub/kana_table.h b/...ibaegisub/include/libaegisub/kana_table.h → libaegisub/include/libaegisub/kana_table.h
diff --git a/...isub/include/libaegisub/karaoke_matcher.h → ...isub/include/libaegisub/karaoke_matcher.h b/...isub/include/libaegisub/karaoke_matcher.h → ...isub/include/libaegisub/karaoke_matcher.h
diff --git a/.../libaegisub/include/libaegisub/keyframe.h → libaegisub/include/libaegisub/keyframe.h b/.../libaegisub/include/libaegisub/keyframe.h → libaegisub/include/libaegisub/keyframe.h
diff --git a/...egisub/include/libaegisub/line_iterator.h → ...egisub/include/libaegisub/line_iterator.h b/...egisub/include/libaegisub/line_iterator.h → ...egisub/include/libaegisub/line_iterator.h
diff --git a/...libaegisub/include/libaegisub/line_wrap.h → libaegisub/include/libaegisub/line_wrap.h b/...libaegisub/include/libaegisub/line_wrap.h → libaegisub/include/libaegisub/line_wrap.h
diff --git a/aegisub/libaegisub/include/libaegisub/log.h → libaegisub/include/libaegisub/log.h b/aegisub/libaegisub/include/libaegisub/log.h → libaegisub/include/libaegisub/log.h
diff --git a/aegisub/libaegisub/include/libaegisub/mru.h → libaegisub/include/libaegisub/mru.h b/aegisub/libaegisub/include/libaegisub/mru.h → libaegisub/include/libaegisub/mru.h
diff --git a/...isub/include/libaegisub/of_type_adaptor.h → ...isub/include/libaegisub/of_type_adaptor.h b/...isub/include/libaegisub/of_type_adaptor.h → ...isub/include/libaegisub/of_type_adaptor.h
diff --git a/...ub/libaegisub/include/libaegisub/option.h → libaegisub/include/libaegisub/option.h b/...ub/libaegisub/include/libaegisub/option.h → libaegisub/include/libaegisub/option.h
diff --git a/...aegisub/include/libaegisub/option_value.h → libaegisub/include/libaegisub/option_value.h b/...aegisub/include/libaegisub/option_value.h → libaegisub/include/libaegisub/option_value.h
diff --git a/...nclude/libaegisub/owning_intrusive_list.h → ...nclude/libaegisub/owning_intrusive_list.h b/...nclude/libaegisub/owning_intrusive_list.h → ...nclude/libaegisub/owning_intrusive_list.h
diff --git a/aegisub/libaegisub/include/libaegisub/path.h → libaegisub/include/libaegisub/path.h b/aegisub/libaegisub/include/libaegisub/path.h → libaegisub/include/libaegisub/path.h
diff --git a/...ibaegisub/include/libaegisub/scoped_ptr.h → libaegisub/include/libaegisub/scoped_ptr.h b/...ibaegisub/include/libaegisub/scoped_ptr.h → libaegisub/include/libaegisub/scoped_ptr.h
diff --git a/...ub/libaegisub/include/libaegisub/signal.h → libaegisub/include/libaegisub/signal.h b/...ub/libaegisub/include/libaegisub/signal.h → libaegisub/include/libaegisub/signal.h
diff --git a/...aegisub/include/libaegisub/spellchecker.h → libaegisub/include/libaegisub/spellchecker.h b/...aegisub/include/libaegisub/spellchecker.h → libaegisub/include/libaegisub/spellchecker.h
diff --git a/...sub/libaegisub/include/libaegisub/split.h → libaegisub/include/libaegisub/split.h b/...sub/libaegisub/include/libaegisub/split.h → libaegisub/include/libaegisub/split.h
diff --git a/...libaegisub/include/libaegisub/thesaurus.h → libaegisub/include/libaegisub/thesaurus.h b/...libaegisub/include/libaegisub/thesaurus.h → libaegisub/include/libaegisub/thesaurus.h
diff --git a/aegisub/libaegisub/include/libaegisub/time.h → libaegisub/include/libaegisub/time.h b/aegisub/libaegisub/include/libaegisub/time.h → libaegisub/include/libaegisub/time.h
diff --git a/aegisub/libaegisub/include/libaegisub/util.h → libaegisub/include/libaegisub/util.h b/aegisub/libaegisub/include/libaegisub/util.h → libaegisub/include/libaegisub/util.h
diff --git a/.../libaegisub/include/libaegisub/util_osx.h → libaegisub/include/libaegisub/util_osx.h b/.../libaegisub/include/libaegisub/util_osx.h → libaegisub/include/libaegisub/util_osx.h
diff --git a/.../libaegisub/include/libaegisub/util_win.h → libaegisub/include/libaegisub/util_win.h b/.../libaegisub/include/libaegisub/util_win.h → libaegisub/include/libaegisub/util_win.h
diff --git a/aegisub/libaegisub/include/libaegisub/vfr.h → libaegisub/include/libaegisub/vfr.h b/aegisub/libaegisub/include/libaegisub/vfr.h → libaegisub/include/libaegisub/vfr.h
diff --git a/aegisub/libaegisub/lagi_pre.h → libaegisub/lagi_pre.h b/aegisub/libaegisub/lagi_pre.h → libaegisub/lagi_pre.h
diff --git a/aegisub/libaegisub/osx/util.mm → libaegisub/osx/util.mm b/aegisub/libaegisub/osx/util.mm → libaegisub/osx/util.mm
diff --git a/aegisub/libaegisub/unix/access.cpp → libaegisub/unix/access.cpp b/aegisub/libaegisub/unix/access.cpp → libaegisub/unix/access.cpp
diff --git a/aegisub/libaegisub/unix/fs.cpp → libaegisub/unix/fs.cpp b/aegisub/libaegisub/unix/fs.cpp → libaegisub/unix/fs.cpp
diff --git a/aegisub/libaegisub/unix/log.cpp → libaegisub/unix/log.cpp b/aegisub/libaegisub/unix/log.cpp → libaegisub/unix/log.cpp
diff --git a/aegisub/libaegisub/unix/path.cpp → libaegisub/unix/path.cpp b/aegisub/libaegisub/unix/path.cpp → libaegisub/unix/path.cpp
diff --git a/aegisub/libaegisub/unix/util.cpp → libaegisub/unix/util.cpp b/aegisub/libaegisub/unix/util.cpp → libaegisub/unix/util.cpp
diff --git a/aegisub/libaegisub/windows/access.cpp → libaegisub/windows/access.cpp b/aegisub/libaegisub/windows/access.cpp → libaegisub/windows/access.cpp
diff --git a/...b/libaegisub/windows/charset_conv_win.cpp → libaegisub/windows/charset_conv_win.cpp b/...b/libaegisub/windows/charset_conv_win.cpp → libaegisub/windows/charset_conv_win.cpp
diff --git a/aegisub/libaegisub/windows/fs.cpp → libaegisub/windows/fs.cpp b/aegisub/libaegisub/windows/fs.cpp → libaegisub/windows/fs.cpp
diff --git a/aegisub/libaegisub/windows/lagi_pre.cpp → libaegisub/windows/lagi_pre.cpp b/aegisub/libaegisub/windows/lagi_pre.cpp → libaegisub/windows/lagi_pre.cpp
diff --git a/aegisub/libaegisub/windows/log_win.cpp → libaegisub/windows/log_win.cpp b/aegisub/libaegisub/windows/log_win.cpp → libaegisub/windows/log_win.cpp
diff --git a/aegisub/libaegisub/windows/path_win.cpp → libaegisub/windows/path_win.cpp b/aegisub/libaegisub/windows/path_win.cpp → libaegisub/windows/path_win.cpp
diff --git a/aegisub/libaegisub/windows/util_win.cpp → libaegisub/windows/util_win.cpp b/aegisub/libaegisub/windows/util_win.cpp → libaegisub/windows/util_win.cpp
diff --git a/aegisub/m4macros/ac_agi.m4 → m4macros/ac_agi.m4 b/aegisub/m4macros/ac_agi.m4 → m4macros/ac_agi.m4
diff --git a/aegisub/m4macros/ac_agi_mdcpucfg.m4 → m4macros/ac_agi_mdcpucfg.m4 b/aegisub/m4macros/ac_agi_mdcpucfg.m4 → m4macros/ac_agi_mdcpucfg.m4
diff --git a/aegisub/m4macros/ac_flag.m4 → m4macros/ac_flag.m4 b/aegisub/m4macros/ac_flag.m4 → m4macros/ac_flag.m4
diff --git a/aegisub/m4macros/agi_find_libheader.m4 → m4macros/agi_find_libheader.m4 b/aegisub/m4macros/agi_find_libheader.m4 → m4macros/agi_find_libheader.m4
diff --git a/aegisub/m4macros/ax_boost_asio.m4 → m4macros/ax_boost_asio.m4 b/aegisub/m4macros/ax_boost_asio.m4 → m4macros/ax_boost_asio.m4
diff --git a/aegisub/m4macros/ax_boost_base.m4 → m4macros/ax_boost_base.m4 b/aegisub/m4macros/ax_boost_base.m4 → m4macros/ax_boost_base.m4
diff --git a/aegisub/m4macros/ax_boost_chrono.m4 → m4macros/ax_boost_chrono.m4 b/aegisub/m4macros/ax_boost_chrono.m4 → m4macros/ax_boost_chrono.m4
diff --git a/aegisub/m4macros/ax_boost_filesystem.m4 → m4macros/ax_boost_filesystem.m4 b/aegisub/m4macros/ax_boost_filesystem.m4 → m4macros/ax_boost_filesystem.m4
diff --git a/aegisub/m4macros/ax_boost_locale.m4 → m4macros/ax_boost_locale.m4 b/aegisub/m4macros/ax_boost_locale.m4 → m4macros/ax_boost_locale.m4
diff --git a/aegisub/m4macros/ax_boost_regex.m4 → m4macros/ax_boost_regex.m4 b/aegisub/m4macros/ax_boost_regex.m4 → m4macros/ax_boost_regex.m4
diff --git a/aegisub/m4macros/ax_boost_system.m4 → m4macros/ax_boost_system.m4 b/aegisub/m4macros/ax_boost_system.m4 → m4macros/ax_boost_system.m4
diff --git a/aegisub/m4macros/ax_boost_thread.m4 → m4macros/ax_boost_thread.m4 b/aegisub/m4macros/ax_boost_thread.m4 → m4macros/ax_boost_thread.m4
diff --git a/aegisub/m4macros/ax_check_gl.m4 → m4macros/ax_check_gl.m4 b/aegisub/m4macros/ax_check_gl.m4 → m4macros/ax_check_gl.m4
diff --git a/aegisub/m4macros/ax_lang_compiler_ms.m4 → m4macros/ax_lang_compiler_ms.m4 b/aegisub/m4macros/ax_lang_compiler_ms.m4 → m4macros/ax_lang_compiler_ms.m4
diff --git a/aegisub/m4macros/ax_pthread.m4 → m4macros/ax_pthread.m4 b/aegisub/m4macros/ax_pthread.m4 → m4macros/ax_pthread.m4
diff --git a/aegisub/m4macros/check_gnu_make.m4 → m4macros/check_gnu_make.m4 b/aegisub/m4macros/check_gnu_make.m4 → m4macros/check_gnu_make.m4
diff --git a/aegisub/m4macros/wxwin.m4 → m4macros/wxwin.m4 b/aegisub/m4macros/wxwin.m4 → m4macros/wxwin.m4
diff --git a/aegisub/packages/distfile/distfile.sh → packages/distfile/distfile.sh b/aegisub/packages/distfile/distfile.sh → packages/distfile/distfile.sh
diff --git a/...b/packages/osx_bundle/Contents/Info.plist → packages/osx_bundle/Contents/Info.plist b/...b/packages/osx_bundle/Contents/Info.plist → packages/osx_bundle/Contents/Info.plist
diff --git a/...sx_bundle/Contents/Resources/Aegisub.icns → ...sx_bundle/Contents/Resources/Aegisub.icns b/...sx_bundle/Contents/Resources/Aegisub.icns → ...sx_bundle/Contents/Resources/Aegisub.icns
diff --git a/...sx_bundle/Contents/Resources/assIcon.icns → ...sx_bundle/Contents/Resources/assIcon.icns b/...sx_bundle/Contents/Resources/assIcon.icns → ...sx_bundle/Contents/Resources/assIcon.icns
diff --git a/...tc/fonts/conf.d/20-fix-globaladvance.conf → ...tc/fonts/conf.d/20-fix-globaladvance.conf b/...tc/fonts/conf.d/20-fix-globaladvance.conf → ...tc/fonts/conf.d/20-fix-globaladvance.conf
diff --git a/...tc/fonts/conf.d/20-unhint-small-vera.conf → ...tc/fonts/conf.d/20-unhint-small-vera.conf b/...tc/fonts/conf.d/20-unhint-small-vera.conf → ...tc/fonts/conf.d/20-unhint-small-vera.conf
diff --git a/...s/etc/fonts/conf.d/30-metric-aliases.conf → ...s/etc/fonts/conf.d/30-metric-aliases.conf b/...s/etc/fonts/conf.d/30-metric-aliases.conf → ...s/etc/fonts/conf.d/30-metric-aliases.conf
diff --git a/...rces/etc/fonts/conf.d/30-urw-aliases.conf → ...rces/etc/fonts/conf.d/30-urw-aliases.conf b/...rces/etc/fonts/conf.d/30-urw-aliases.conf → ...rces/etc/fonts/conf.d/30-urw-aliases.conf
diff --git a/...sources/etc/fonts/conf.d/40-nonlatin.conf → ...sources/etc/fonts/conf.d/40-nonlatin.conf b/...sources/etc/fonts/conf.d/40-nonlatin.conf → ...sources/etc/fonts/conf.d/40-nonlatin.conf
diff --git a/.../Resources/etc/fonts/conf.d/45-latin.conf → .../Resources/etc/fonts/conf.d/45-latin.conf b/.../Resources/etc/fonts/conf.d/45-latin.conf → .../Resources/etc/fonts/conf.d/45-latin.conf
diff --git a/...ources/etc/fonts/conf.d/49-sansserif.conf → ...ources/etc/fonts/conf.d/49-sansserif.conf b/...ources/etc/fonts/conf.d/49-sansserif.conf → ...ources/etc/fonts/conf.d/49-sansserif.conf
diff --git a/.../Resources/etc/fonts/conf.d/51-local.conf → .../Resources/etc/fonts/conf.d/51-local.conf b/.../Resources/etc/fonts/conf.d/51-local.conf → .../Resources/etc/fonts/conf.d/51-local.conf
diff --git a/.../Resources/etc/fonts/conf.d/60-latin.conf → .../Resources/etc/fonts/conf.d/60-latin.conf b/.../Resources/etc/fonts/conf.d/60-latin.conf → .../Resources/etc/fonts/conf.d/60-latin.conf
diff --git a/...es/etc/fonts/conf.d/65-fonts-persian.conf → ...es/etc/fonts/conf.d/65-fonts-persian.conf b/...es/etc/fonts/conf.d/65-fonts-persian.conf → ...es/etc/fonts/conf.d/65-fonts-persian.conf
diff --git a/...sources/etc/fonts/conf.d/65-nonlatin.conf → ...sources/etc/fonts/conf.d/65-nonlatin.conf b/...sources/etc/fonts/conf.d/65-nonlatin.conf → ...sources/etc/fonts/conf.d/65-nonlatin.conf
diff --git a/...esources/etc/fonts/conf.d/69-unifont.conf → ...esources/etc/fonts/conf.d/69-unifont.conf b/...esources/etc/fonts/conf.d/69-unifont.conf → ...esources/etc/fonts/conf.d/69-unifont.conf
diff --git a/...ources/etc/fonts/conf.d/80-delicious.conf → ...ources/etc/fonts/conf.d/80-delicious.conf b/...ources/etc/fonts/conf.d/80-delicious.conf → ...ources/etc/fonts/conf.d/80-delicious.conf
diff --git a/...ources/etc/fonts/conf.d/90-synthetic.conf → ...ources/etc/fonts/conf.d/90-synthetic.conf b/...ources/etc/fonts/conf.d/90-synthetic.conf → ...ources/etc/fonts/conf.d/90-synthetic.conf
diff --git a/...e/Contents/Resources/etc/fonts/fonts.conf → ...e/Contents/Resources/etc/fonts/fonts.conf b/...e/Contents/Resources/etc/fonts/fonts.conf → ...e/Contents/Resources/etc/fonts/fonts.conf
diff --git a/...le/Contents/Resources/etc/fonts/fonts.dtd → ...le/Contents/Resources/etc/fonts/fonts.dtd b/...le/Contents/Resources/etc/fonts/fonts.dtd → ...le/Contents/Resources/etc/fonts/fonts.dtd
diff --git a/...sx_bundle/Contents/Resources/srtIcon.icns → ...sx_bundle/Contents/Resources/srtIcon.icns b/...sx_bundle/Contents/Resources/srtIcon.icns → ...sx_bundle/Contents/Resources/srtIcon.icns
diff --git a/...sx_bundle/Contents/Resources/ssaIcon.icns → ...sx_bundle/Contents/Resources/ssaIcon.icns b/...sx_bundle/Contents/Resources/ssaIcon.icns → ...sx_bundle/Contents/Resources/ssaIcon.icns
diff --git a/...sx_bundle/Contents/Resources/txtIcon.icns → ...sx_bundle/Contents/Resources/txtIcon.icns b/...sx_bundle/Contents/Resources/txtIcon.icns → ...sx_bundle/Contents/Resources/txtIcon.icns
diff --git a/aegisub/packages/osx_dmg/DS_Store → packages/osx_dmg/DS_Store b/aegisub/packages/osx_dmg/DS_Store → packages/osx_dmg/DS_Store
diff --git a/aegisub/packages/osx_dmg/dmg_background.png → packages/osx_dmg/dmg_background.png b/aegisub/packages/osx_dmg/dmg_background.png → packages/osx_dmg/dmg_background.png
diff --git a/...ackages/osx_dmg/dmg_set_style.applescript → packages/osx_dmg/dmg_set_style.applescript b/...ackages/osx_dmg/dmg_set_style.applescript → packages/osx_dmg/dmg_set_style.applescript
diff --git a/.../packages/win_installer/aegisub-large.bmp → packages/win_installer/aegisub-large.bmp b/.../packages/win_installer/aegisub-large.bmp → packages/win_installer/aegisub-large.bmp
diff --git a/.../packages/win_installer/aegisub-large.pdn → packages/win_installer/aegisub-large.pdn b/.../packages/win_installer/aegisub-large.pdn → packages/win_installer/aegisub-large.pdn
diff --git a/aegisub/packages/win_installer/aegisub.bmp → packages/win_installer/aegisub.bmp b/aegisub/packages/win_installer/aegisub.bmp → packages/win_installer/aegisub.bmp
diff --git a/aegisub/packages/win_installer/aegisub.pdn → packages/win_installer/aegisub.pdn b/aegisub/packages/win_installer/aegisub.pdn → packages/win_installer/aegisub.pdn
diff --git a/aegisub/packages/win_installer/aegisub3.iss → packages/win_installer/aegisub3.iss b/aegisub/packages/win_installer/aegisub3.iss → packages/win_installer/aegisub3.iss
diff --git a/...ub/packages/win_installer/aegisub3_64.iss → packages/win_installer/aegisub3_64.iss b/...ub/packages/win_installer/aegisub3_64.iss → packages/win_installer/aegisub3_64.iss
diff --git a/..._installer/build_dictionary_installers.sh → ..._installer/build_dictionary_installers.sh b/..._installer/build_dictionary_installers.sh → ..._installer/build_dictionary_installers.sh
diff --git a/...taller/dictionaries/fragment_dictbase.iss → ...taller/dictionaries/fragment_dictbase.iss b/...taller/dictionaries/fragment_dictbase.iss → ...taller/dictionaries/fragment_dictbase.iss
diff --git a/...staller/dictionaries/fragment_stddict.iss → ...staller/dictionaries/fragment_stddict.iss b/...staller/dictionaries/fragment_stddict.iss → ...staller/dictionaries/fragment_stddict.iss
diff --git a/...ages/win_installer/dictionaries/sr_SR.iss → ...ages/win_installer/dictionaries/sr_SR.iss b/...ages/win_installer/dictionaries/sr_SR.iss → ...ages/win_installer/dictionaries/sr_SR.iss