Skip to content

Commit

Permalink
Merge pull request #1 from Qbase-Foundation/2.0
Browse files Browse the repository at this point in the history
Upgrade to 2.0
  • Loading branch information
s2n-Gribbly committed Oct 10, 2018
2 parents 6ae4fe2 + 7ee6158 commit 49f282f
Show file tree
Hide file tree
Showing 98 changed files with 639 additions and 630 deletions.
34 changes: 17 additions & 17 deletions Makefile
Expand Up @@ -277,15 +277,15 @@ distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = ${SHELL} /home/qbase/Qbase/build-aux/missing aclocal-1.15
ACLOCAL = ${SHELL} /home/mr/qbase/build-aux/missing aclocal-1.15
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 0
AR = /usr/bin/ar
ARFLAGS = cr
AUTOCONF = ${SHELL} /home/qbase/Qbase/build-aux/missing autoconf
AUTOHEADER = ${SHELL} /home/qbase/Qbase/build-aux/missing autoheader
AUTOMAKE = ${SHELL} /home/qbase/Qbase/build-aux/missing automake-1.15
AWK = gawk
AUTOCONF = ${SHELL} /home/mr/qbase/build-aux/missing autoconf
AUTOHEADER = ${SHELL} /home/mr/qbase/build-aux/missing autoheader
AUTOMAKE = ${SHELL} /home/mr/qbase/build-aux/missing automake-1.15
AWK = mawk
BDB_CFLAGS =
BDB_CPPFLAGS =
BDB_LIBS = -ldb_cxx-4.8
Expand All @@ -307,11 +307,11 @@ CC = gcc
CCACHE =
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
CLIENT_VERSION_BUILD = 1
CLIENT_VERSION_BUILD = 0
CLIENT_VERSION_IS_RELEASE = true
CLIENT_VERSION_MAJOR = 1
CLIENT_VERSION_MAJOR = 2
CLIENT_VERSION_MINOR = 0
CLIENT_VERSION_REVISION = 2
CLIENT_VERSION_REVISION = 0
COPYRIGHT_HOLDERS = The %s developers
COPYRIGHT_HOLDERS_FINAL = The Qbase Core developers
COPYRIGHT_HOLDERS_SUBSTITUTION = Qbase Core
Expand Down Expand Up @@ -381,7 +381,7 @@ LTLIBOBJS =
LT_SYS_LIBRARY_PATH =
LUPDATE = /usr/lib/x86_64-linux-gnu/qt5/bin/lupdate
MAINT =
MAKEINFO = ${SHELL} /home/qbase/Qbase/build-aux/missing makeinfo
MAKEINFO = ${SHELL} /home/mr/qbase/build-aux/missing makeinfo
MAKENSIS =
MANIFEST_TOOL = :
MINIUPNPC_CPPFLAGS =
Expand All @@ -402,10 +402,10 @@ OTOOL64 =
PACKAGE = qbasecore
PACKAGE_BUGREPORT = https://github.com/NicholasAdmin/Qbase/issues
PACKAGE_NAME = Qbase Core
PACKAGE_STRING = Qbase Core 1.0.2
PACKAGE_STRING = Qbase Core 2.0.0
PACKAGE_TARNAME = qbasecore
PACKAGE_URL =
PACKAGE_VERSION = 1.0.2
PACKAGE_VERSION = 2.0.0
PATH_SEPARATOR = :
PIC_FLAGS = -fPIC
PIE_FLAGS = -fPIE
Expand Down Expand Up @@ -464,18 +464,18 @@ UNIVALUE_CFLAGS = -I$(srcdir)/univalue/include
UNIVALUE_LIBS = univalue/libunivalue.la
USE_QRCODE =
USE_UPNP =
VERSION = 1.0.2
VERSION = 2.0.0
WINDOWS_BITS =
WINDRES =
X11XCB_CFLAGS =
X11XCB_LIBS =
XGETTEXT = /usr/bin/xgettext
ZMQ_CFLAGS =
ZMQ_LIBS = -lzmq
abs_builddir = /home/qbase/Qbase
abs_srcdir = /home/qbase/Qbase
abs_top_builddir = /home/qbase/Qbase
abs_top_srcdir = /home/qbase/Qbase
abs_builddir = /home/mr/qbase
abs_srcdir = /home/mr/qbase
abs_top_builddir = /home/mr/qbase
abs_top_srcdir = /home/mr/qbase
ac_ct_AR = ar
ac_ct_CC = gcc
ac_ct_CXX = g++
Expand Down Expand Up @@ -507,7 +507,7 @@ host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /home/qbase/Qbase/build-aux/install-sh
install_sh = ${SHELL} /home/mr/qbase/build-aux/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
Expand Down
Binary file modified about.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 16 additions & 16 deletions autom4te.cache/output.0
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
@%:@ Generated by GNU Autoconf 2.69 for Qbase Core 1.0.2.
@%:@ Generated by GNU Autoconf 2.69 for Qbase Core 2.0.0.
@%:@
@%:@ Report bugs to <https://github.com/NicholasAdmin/Qbase/issues>.
@%:@
Expand Down Expand Up @@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Qbase Core'
PACKAGE_TARNAME='qbasecore'
PACKAGE_VERSION='1.0.2'
PACKAGE_STRING='Qbase Core 1.0.2'
PACKAGE_VERSION='2.0.0'
PACKAGE_STRING='Qbase Core 2.0.0'
PACKAGE_BUGREPORT='https://github.com/NicholasAdmin/Qbase/issues'
PACKAGE_URL=''

Expand Down Expand Up @@ -1597,7 +1597,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Qbase Core 1.0.2 to adapt to many kinds of systems.
\`configure' configures Qbase Core 2.0.0 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1668,7 +1668,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Qbase Core 1.0.2:";;
short | recursive ) echo "Configuration of Qbase Core 2.0.0:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1935,7 +1935,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Qbase Core configure 1.0.2
Qbase Core configure 2.0.0
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2618,7 +2618,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by Qbase Core $as_me 1.0.2, which was
It was created by Qbase Core $as_me 2.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -3574,7 +3574,7 @@ fi

# Define the identity of the package.
PACKAGE='qbasecore'
VERSION='1.0.2'
VERSION='2.0.0'


# Some tools Automake needs.
Expand Down Expand Up @@ -30844,16 +30844,16 @@ fi



$as_echo "@%:@define CLIENT_VERSION_MAJOR 1" >>confdefs.h
$as_echo "@%:@define CLIENT_VERSION_MAJOR 2" >>confdefs.h


$as_echo "@%:@define CLIENT_VERSION_MINOR 0" >>confdefs.h


$as_echo "@%:@define CLIENT_VERSION_REVISION 2" >>confdefs.h
$as_echo "@%:@define CLIENT_VERSION_REVISION 0" >>confdefs.h


$as_echo "@%:@define CLIENT_VERSION_BUILD 1" >>confdefs.h
$as_echo "@%:@define CLIENT_VERSION_BUILD 0" >>confdefs.h


$as_echo "@%:@define CLIENT_VERSION_IS_RELEASE true" >>confdefs.h
Expand All @@ -30871,13 +30871,13 @@ $as_echo "@%:@define COPYRIGHT_HOLDERS_SUBSTITUTION \"Qbase Core\"" >>confdefs.h

$as_echo "@%:@define COPYRIGHT_HOLDERS_FINAL \"The Qbase Core developers\"" >>confdefs.h

CLIENT_VERSION_MAJOR=1
CLIENT_VERSION_MAJOR=2

CLIENT_VERSION_MINOR=0

CLIENT_VERSION_REVISION=2
CLIENT_VERSION_REVISION=0

CLIENT_VERSION_BUILD=1
CLIENT_VERSION_BUILD=0

CLIENT_VERSION_IS_RELEASE=true

Expand Down Expand Up @@ -31584,7 +31584,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Qbase Core $as_me 1.0.2, which was
This file was extended by Qbase Core $as_me 2.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -31650,7 +31650,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Qbase Core config.status 1.0.2
Qbase Core config.status 2.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down
32 changes: 16 additions & 16 deletions autom4te.cache/output.1
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
@%:@ Generated by GNU Autoconf 2.69 for Qbase Core 1.0.2.
@%:@ Generated by GNU Autoconf 2.69 for Qbase Core 2.0.0.
@%:@
@%:@ Report bugs to <https://github.com/NicholasAdmin/Qbase/issues>.
@%:@
Expand Down Expand Up @@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Qbase Core'
PACKAGE_TARNAME='qbasecore'
PACKAGE_VERSION='1.0.2'
PACKAGE_STRING='Qbase Core 1.0.2'
PACKAGE_VERSION='2.0.0'
PACKAGE_STRING='Qbase Core 2.0.0'
PACKAGE_BUGREPORT='https://github.com/NicholasAdmin/Qbase/issues'
PACKAGE_URL=''

Expand Down Expand Up @@ -1597,7 +1597,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Qbase Core 1.0.2 to adapt to many kinds of systems.
\`configure' configures Qbase Core 2.0.0 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1668,7 +1668,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Qbase Core 1.0.2:";;
short | recursive ) echo "Configuration of Qbase Core 2.0.0:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1935,7 +1935,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Qbase Core configure 1.0.2
Qbase Core configure 2.0.0
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2618,7 +2618,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by Qbase Core $as_me 1.0.2, which was
It was created by Qbase Core $as_me 2.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -3574,7 +3574,7 @@ fi

# Define the identity of the package.
PACKAGE='qbasecore'
VERSION='1.0.2'
VERSION='2.0.0'


# Some tools Automake needs.
Expand Down Expand Up @@ -30844,16 +30844,16 @@ fi



$as_echo "@%:@define CLIENT_VERSION_MAJOR 1" >>confdefs.h
$as_echo "@%:@define CLIENT_VERSION_MAJOR 2" >>confdefs.h


$as_echo "@%:@define CLIENT_VERSION_MINOR 0" >>confdefs.h


$as_echo "@%:@define CLIENT_VERSION_REVISION 2" >>confdefs.h
$as_echo "@%:@define CLIENT_VERSION_REVISION 0" >>confdefs.h


$as_echo "@%:@define CLIENT_VERSION_BUILD 1" >>confdefs.h
$as_echo "@%:@define CLIENT_VERSION_BUILD 0" >>confdefs.h


$as_echo "@%:@define CLIENT_VERSION_IS_RELEASE true" >>confdefs.h
Expand All @@ -30871,13 +30871,13 @@ $as_echo "@%:@define COPYRIGHT_HOLDERS_SUBSTITUTION \"Qbase Core\"" >>confdefs.h

$as_echo "@%:@define COPYRIGHT_HOLDERS_FINAL \"The Qbase Core developers\"" >>confdefs.h

CLIENT_VERSION_MAJOR=1
CLIENT_VERSION_MAJOR=2

CLIENT_VERSION_MINOR=0

CLIENT_VERSION_REVISION=2
CLIENT_VERSION_REVISION=0

CLIENT_VERSION_BUILD=1
CLIENT_VERSION_BUILD=0

CLIENT_VERSION_IS_RELEASE=true

Expand Down Expand Up @@ -31584,7 +31584,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Qbase Core $as_me 1.0.2, which was
This file was extended by Qbase Core $as_me 2.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -31650,7 +31650,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Qbase Core config.status 1.0.2
Qbase Core config.status 2.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down

0 comments on commit 49f282f

Please sign in to comment.