Skip to content
GitLab
Commit efa816a2 authored by A. Jesse Jiryu Davis's avatar A. Jesse Jiryu Davis
Browse files

Merge branch 'pr-193' 

# By Jason Carey (hanumantmk)
# Via Jason Carey (hanumantmk)
* pr-193:
  prerelease version

Conflicts:
	CMakeLists.txt
	build/autotools/Versions.m4
parents 2ef028cd 74ab23b9
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment