← Back to branch summary

~moonshot/moonshot-tr/debian-native

~moonshot/moonshot-tr/debian-native

Viewing all changes in revision 59.

Committer: Sam Hartman
Date: 2014-08-27 23:02:29 UTC
mfrom: (22.7.73)
Revision ID: git-v1:865021ac72f6f414e988227cfd99ff125fef4c76

Merge branch 'upstream' into debian

Merge 1.3.1 into Debian

files added:
Makefile.in

aclocal.m4

build-aux

build-aux/compile

build-aux/config.guess

build-aux/config.sub

build-aux/depcomp

build-aux/install-sh

build-aux/ltmain.sh

build-aux/missing

build-aux/test-driver

configure

gsscon/Makefile.in

m4

m4/libtool.m4

m4/ltoptions.m4

m4/ltsugar.m4

m4/ltversion.m4

m4/lt~obsolete.m4

files removed:
.gitignore

gsscon/.#gsscon_test.c

gsscon/test/.gitignore

tr/.gitignore

tr/manual.cfg

tr/portal.cfg

files modified:
configure.ac

gsscon/gsscon_passive.c

tid/example/tidc_main.c

trust_router.spec

Show diffs side-by-side

added added

removed removed

build-aux/compile

build-aux/config.guess

build-aux/config.sub

build-aux/depcomp

build-aux/install-sh

build-aux/ltmain.sh

build-aux/missing

build-aux/test-driver

gsscon/.#gsscon_test.c@

gsscon/Makefile.in

gsscon/gsscon_passive.c

gsscon/test/.gitignore

m4/ltoptions.m4

m4/ltversion.m4

m4/lt~obsolete.m4

tid/example/tidc_main.c

trust_router.spec

Older »