Merge branch 'master' of ssh://vasks.debian.org/git/debian-science/packages/mathgl
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 23 Nov 2012 21:20:30 +0000 (23:20 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 23 Nov 2012 21:20:30 +0000 (23:20 +0200)
commite3572d2a628e081d7b33a273ed02a1e7d20c360a
treecfa4d3fa93ace02019c6cbf48bcd13e2b5d474a3
parent97a60aa78b3f9c1250785143eeba47546e582e34
parent99dec6fe15f0928998f61a3b503d0f55ab6cccf4
Merge branch 'master' of ssh://vasks.debian.org/git/debian-science/packages/mathgl

Conflicts:
Makefile.in
aclocal.m4
configure
debian/changelog
examples/Makefile.in
include/Makefile.in
lang/Makefile.in
mgl/Makefile.in
utils/Makefile.in
widgets/Makefile.in
Makefile.in.orig
aclocal.m4.orig
configure.orig
debian/changelog.orig
examples/Makefile.in.orig
include/Makefile.in.orig
lang/Makefile.in.orig
mgl/Makefile.in.orig
utils/Makefile.in.orig
widgets/Makefile.in.orig