Viewing all changes in revision 1567.
- Committer: Geronimo Bareiro
- Date: 2016-05-12 05:52:57 UTC
- mfrom: (1552.2.116 scratch)
- Revision ID: gero.bare@gmail.com-20160512055257-av35z9e8ky7k0rxi
Solve merge conflict
- files added:
- data/scratch-text-editor.appdata.xml
- files removed:
- plugins/outline/icons/class-symbolic.svg
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
plugins/outline/icons/abstractclass.svg
plugins/outline/icons/abstractmethod.svg
plugins/outline/icons/abstractproperty.svg
plugins/outline/icons/class-symbolic.svg
plugins/outline/icons/class.svg
plugins/outline/icons/constant-symbolic.svg
plugins/outline/icons/constant.svg
plugins/outline/icons/constructor.svg
plugins/outline/icons/delegate.svg
plugins/outline/icons/enum-symbolic.svg
plugins/outline/icons/enum.svg
plugins/outline/icons/errordomain.svg
plugins/outline/icons/field-symbolic.svg
plugins/outline/icons/interface-symbolic.svg
plugins/outline/icons/interface.svg
plugins/outline/icons/method.svg
plugins/outline/icons/namespace.svg
plugins/outline/icons/property-symbolic.svg
plugins/outline/icons/property.svg
plugins/outline/icons/signal-symbolic.svg
plugins/outline/icons/signal.svg
plugins/outline/icons/staticmethod.svg
plugins/outline/icons/struct.svg
plugins/outline/icons/structure-symbolic.svg
plugins/outline/icons/virtualmethod.svg
plugins/outline/icons/virtualproperty.svg
