Viewing all changes in revision 49.
- Committer: Chase Douglas
- Date: 2012-03-20 01:05:25 UTC
- mfrom: (36.1.12 trunk)
- Revision ID: chase.douglas@canonical.com-20120320010525-vg8u8rl57vq276xv
Merge branch 'debian-unstable' into ubuntu
Conflicts:
debian/changelog
Conflicts:
debian/changelog
- files added:
- .gitignore
- aclocal
- data
- data/xorg
- data/xorg/gtest
- include/xorg/gtest/evemu
- files removed:
- Changelog
- conf
- files renamed:
- conf/dummy.conf => data/xorg/gtest/dummy.conf
- examples/xorg-gtest.cpp => examples/xorg-gtest-example.cpp
- src/main.cpp => src/xorg-gtest_main.cpp
- files modified:
- COPYING
expand all
collapse all
added
removed
