new file:   AUTHORS
	new file:   COPYING
	new file:   ChangeLog
	new file:   INSTALL
	new file:   Makefile.am
	new file:   NEWS
	new file:   README
	new file:   aclocal.m4
	new file:   autom4te.cache/output.0
	new file:   autom4te.cache/output.1
	new file:   autom4te.cache/requests
	new file:   autom4te.cache/traces.0
	new file:   autom4te.cache/traces.1
	new file:   config.guess
	new file:   config.sub
	new file:   configure
	new file:   configure.ac
	new file:   depcomp
	new file:   install-sh
	new file:   ltmain.sh
	new file:   missing
	new file:   poptmx.cpp
	new file:   poptmx.h
	modified:   aclocal.m4
	modified:   autom4te.cache/output.0
	modified:   autom4te.cache/output.1
	modified:   autom4te.cache/requests
	modified:   autom4te.cache/traces.0
	modified:   autom4te.cache/traces.1
	modified:   configure
	new file:   Makefile.in
	typechange: COPYING
	typechange: INSTALL
	deleted:    Makefile.in
	modified:   aclocal.m4
	modified:   autom4te.cache/output.0
	modified:   autom4te.cache/output.1
	modified:   autom4te.cache/requests
	modified:   autom4te.cache/traces.0
	modified:   autom4te.cache/traces.1
	modified:   configure
	typechange: depcomp
	typechange: missing
	new file:   Makefile.in
	modified:   aclocal.m4
	modified:   autom4te.cache/output.0
	modified:   autom4te.cache/output.1
	modified:   autom4te.cache/requests
	modified:   autom4te.cache/traces.0
	modified:   autom4te.cache/traces.1
	modified:   configure
	deleted:    Makefile.am
	deleted:    Makefile.in
	deleted:    aclocal.m4
	deleted:    autom4te.cache/output.0
	deleted:    autom4te.cache/output.1
	deleted:    autom4te.cache/requests
	deleted:    autom4te.cache/traces.0
	deleted:    autom4te.cache/traces.1
	deleted:    config.guess
	deleted:    config.sub
	deleted:    configure
	deleted:    configure.ac
	deleted:    depcomp
	deleted:    install-sh
	deleted:    ltmain.sh
	deleted:    missing

 Untracked files:
	new file:   CMakeLists.txt
	deleted:    AUTHORS
	deleted:    COPYING
	deleted:    INSTALL
	deleted:    NEWS
	deleted:    README
	deleted:    example-0.4/AUTHORS
	deleted:    example-0.4/COPYING
	deleted:    example-0.4/ChangeLog
	deleted:    example-0.4/INSTALL
	deleted:    example-0.4/Makefile.am
	deleted:    example-0.4/Makefile.in
	deleted:    example-0.4/NEWS
	deleted:    example-0.4/README
	deleted:    example-0.4/aclocal.m4
	deleted:    example-0.4/autogen.sh
	deleted:    example-0.4/config.guess
	deleted:    example-0.4/config.h.in
	deleted:    example-0.4/config.sub
	deleted:    example-0.4/configure
	deleted:    example-0.4/configure.ac
	deleted:    example-0.4/depcomp
	deleted:    example-0.4/example-1.0.pc.in
	deleted:    example-0.4/example/example.h
	deleted:    example-0.4/example/something.cc
	deleted:    example-0.4/example/something.h
	deleted:    example-0.4/example/sub/sub.h
	deleted:    example-0.4/install-sh
	deleted:    example-0.4/ltmain.sh
	deleted:    example-0.4/missing
	deleted:    ChangeLog
	modified:   poptmx.cpp
Merge branch 'master' of https://github.com/antonmx/poptmx