Viewing all changes in revision 82.
- Committer: Victor Thompson
- Date: 2015-12-10 01:15:54 UTC
- mfrom: (56.1.131 ubuntu-weather-app)
- Revision ID: victor.thompson@gmail.com-20151210011554-qyyts4uhbzhnoo3g
Merge trunk, resolve conflicts, and add changelog entry
- files added:
- po/be.po
- files renamed:
- debian/ubuntu-weather-app.install => debian/install
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
