← Back to branch summary

~elementary-apps/pantheon-files/trunk

« back to all changes in this revision

Viewing changes to libcore/Enums.vala

Merge updates from parent and resolve conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
libcore/Enums.vala
49
49
    }
50
50
 
51
51
    public enum IconSize {
 
52
        EMBLEM = 16,
52
53
        SMALLEST = 16,
 
54
        LARGE_EMBLEM = 24,
53
55
        SMALLER = 24,
54
56
        SMALL = 32,
55
57
        NORMAL = 48,