~mutse-young/ubuntu-docviewer-app/trunk

2.2.6 by Granger Anthony
Merged from lp:~didrocks/ubuntu-docviewer-app/build-fix
1
Makefile
2.2.5 by Granger Anthony
Fix conflicts
2
ubuntu-docviewer-app
5.1.1 by Granger Anthony
Fix bad QML file path, fix QML filename, fix bad exec path in .desktop, fix error when the QML file is not found
3
*.user
9.1.1 by Granger Anthony
Fix for bug #1176592
4
moc_file.cpp
2.2.5 by Granger Anthony
Fix conflicts
5
launcher/build-docviewer-launcher-Desktop-Debug/
6
launcher/build-docviewer-launcher-Desktop-Release/
7
launcher/src/docviewer-launcher.pro.user
31.1.22 by David Planella
Updated ignore file
8
*.cmake
9
CMakeFiles
10
*_automoc.cpp
31.1.24 by David Planella
Changed plugin path to com.ubuntu...
11
moc_*
1.1.15 by Olivier Tilloy
Add bzr ignore rules.
12
debian/files
13
debian/app-template/
14
debian/*.debhelper.log
15
debian/*.substvars
31.1.22 by David Planella
Updated ignore file
16
com.ubuntu.docviewer.desktop
17
com.ubuntu.docviewer.desktop.in
18
manifest.json