Viewing all changes in revision 293.
- Committer: Adam Bieńkowski
- Date: 2016-11-20 19:22:39 UTC
- mfrom: (289.1.40 switchboard-plug-networking)
- Revision ID: donadigos159@gmail.com-20161120192239-iaghsne3ltfechgy
Resolve conflicts and merge trunk
- files added:
- po/bg.po
- files removed:
- src/polkit-gobject-1.vapi
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
