Merge lp://qastaging/~sbeattie/apparmor/apparmor-deprecated-cleanup into lp://qastaging/apparmor/2.12
Proposed by
Steve Beattie
Status: | Merged |
---|---|
Merged at revision: | 2442 |
Proposed branch: | lp://qastaging/~sbeattie/apparmor/apparmor-deprecated-cleanup |
Merge into: | lp://qastaging/apparmor/2.12 |
Diff against target: |
37799 lines (+6/-37250) 100 files modified
Makefile (+6/-2) deprecated/management/apparmor-dbus/AUTHORS (+0/-1) deprecated/management/apparmor-dbus/COPYING (+0/-340) deprecated/management/apparmor-dbus/INSTALL (+0/-167) deprecated/management/apparmor-dbus/Makefile.am (+0/-5) deprecated/management/apparmor-dbus/README (+0/-8) deprecated/management/apparmor-dbus/apparmor-dbus.spec (+0/-43) deprecated/management/apparmor-dbus/autogen.sh (+0/-31) deprecated/management/apparmor-dbus/configure.in (+0/-16) deprecated/management/apparmor-dbus/src/Makefile.am (+0/-2) deprecated/management/apparmor-dbus/src/aadbus.c (+0/-322) deprecated/management/profile-editor/AUTHORS (+0/-1) deprecated/management/profile-editor/COPYING (+0/-340) deprecated/management/profile-editor/INSTALL (+0/-167) deprecated/management/profile-editor/Makefile.am (+0/-2) deprecated/management/profile-editor/Makefile.cvs (+0/-5) deprecated/management/profile-editor/README (+0/-6) deprecated/management/profile-editor/configure.in (+0/-55) deprecated/management/profile-editor/doc/Makefile.am (+0/-4) deprecated/management/profile-editor/doc/Makefile.in (+0/-342) deprecated/management/profile-editor/doc/en/Makefile.am (+0/-2) deprecated/management/profile-editor/macros/autogen.sh (+0/-6) deprecated/management/profile-editor/profileeditor.spec (+0/-44) deprecated/management/profile-editor/src/AboutDialog.cpp (+0/-114) deprecated/management/profile-editor/src/AboutDialog.h (+0/-56) deprecated/management/profile-editor/src/Configuration.cpp (+0/-185) deprecated/management/profile-editor/src/Configuration.h (+0/-84) deprecated/management/profile-editor/src/Makefile.am (+0/-24) deprecated/management/profile-editor/src/Preferences.cpp (+0/-322) deprecated/management/profile-editor/src/Preferences.h (+0/-102) deprecated/management/profile-editor/src/ProfileDirectoryTraverser.h (+0/-43) deprecated/management/profile-editor/src/ProfileTextCtrl.cpp (+0/-115) deprecated/management/profile-editor/src/ProfileTextCtrl.h (+0/-44) deprecated/management/profile-editor/src/SearchAllProfiles.cpp (+0/-179) deprecated/management/profile-editor/src/SearchAllProfiles.h (+0/-95) deprecated/management/profile-editor/src/opensuse_logo.xpm (+0/-173) deprecated/management/profile-editor/src/profileeditor.cpp (+0/-1156) deprecated/management/profile-editor/src/profileeditor.h (+0/-136) deprecated/management/profile-editor/src/wxStyledTextCtrl/Accessor.h (+0/-78) deprecated/management/profile-editor/src/wxStyledTextCtrl/AutoComplete.cxx (+0/-174) deprecated/management/profile-editor/src/wxStyledTextCtrl/AutoComplete.h (+0/-70) deprecated/management/profile-editor/src/wxStyledTextCtrl/CallTip.cxx (+0/-270) deprecated/management/profile-editor/src/wxStyledTextCtrl/CallTip.h (+0/-65) deprecated/management/profile-editor/src/wxStyledTextCtrl/CellBuffer.cxx (+0/-1120) deprecated/management/profile-editor/src/wxStyledTextCtrl/CellBuffer.h (+0/-250) deprecated/management/profile-editor/src/wxStyledTextCtrl/ContractionState.cxx (+0/-283) deprecated/management/profile-editor/src/wxStyledTextCtrl/ContractionState.h (+0/-65) deprecated/management/profile-editor/src/wxStyledTextCtrl/Document.cxx (+0/-1593) deprecated/management/profile-editor/src/wxStyledTextCtrl/Document.h (+0/-305) deprecated/management/profile-editor/src/wxStyledTextCtrl/DocumentAccessor.cxx (+0/-186) deprecated/management/profile-editor/src/wxStyledTextCtrl/DocumentAccessor.h (+0/-67) deprecated/management/profile-editor/src/wxStyledTextCtrl/Editor.cxx (+0/-7230) deprecated/management/profile-editor/src/wxStyledTextCtrl/Editor.h (+0/-581) deprecated/management/profile-editor/src/wxStyledTextCtrl/ExternalLexer.cxx (+0/-257) deprecated/management/profile-editor/src/wxStyledTextCtrl/ExternalLexer.h (+0/-91) deprecated/management/profile-editor/src/wxStyledTextCtrl/Indicator.cxx (+0/-71) deprecated/management/profile-editor/src/wxStyledTextCtrl/Indicator.h (+0/-22) deprecated/management/profile-editor/src/wxStyledTextCtrl/KeyMap.cxx (+0/-148) deprecated/management/profile-editor/src/wxStyledTextCtrl/KeyMap.h (+0/-43) deprecated/management/profile-editor/src/wxStyledTextCtrl/KeyWords.cxx (+0/-142) deprecated/management/profile-editor/src/wxStyledTextCtrl/KeyWords.h (+0/-82) deprecated/management/profile-editor/src/wxStyledTextCtrl/LexAppArmor.cxx (+0/-189) deprecated/management/profile-editor/src/wxStyledTextCtrl/LineMarker.cxx (+0/-301) deprecated/management/profile-editor/src/wxStyledTextCtrl/LineMarker.h (+0/-50) deprecated/management/profile-editor/src/wxStyledTextCtrl/Makefile.am (+0/-19) deprecated/management/profile-editor/src/wxStyledTextCtrl/PlatWX.cpp (+0/-1396) deprecated/management/profile-editor/src/wxStyledTextCtrl/PlatWX.h (+0/-8) deprecated/management/profile-editor/src/wxStyledTextCtrl/Platform.h (+0/-506) deprecated/management/profile-editor/src/wxStyledTextCtrl/PropSet.cxx (+0/-1170) deprecated/management/profile-editor/src/wxStyledTextCtrl/PropSet.h (+0/-114) deprecated/management/profile-editor/src/wxStyledTextCtrl/RESearch.cxx (+0/-835) deprecated/management/profile-editor/src/wxStyledTextCtrl/RESearch.h (+0/-62) deprecated/management/profile-editor/src/wxStyledTextCtrl/SString.h (+0/-280) deprecated/management/profile-editor/src/wxStyledTextCtrl/SVector.h (+0/-127) deprecated/management/profile-editor/src/wxStyledTextCtrl/SciLexer.h (+0/-1023) deprecated/management/profile-editor/src/wxStyledTextCtrl/Scintilla.h (+0/-768) deprecated/management/profile-editor/src/wxStyledTextCtrl/Scintilla.iface (+0/-2938) deprecated/management/profile-editor/src/wxStyledTextCtrl/ScintillaBase.cxx (+0/-728) deprecated/management/profile-editor/src/wxStyledTextCtrl/ScintillaBase.h (+0/-95) deprecated/management/profile-editor/src/wxStyledTextCtrl/ScintillaWX.cpp (+0/-1093) deprecated/management/profile-editor/src/wxStyledTextCtrl/ScintillaWX.h (+0/-195) deprecated/management/profile-editor/src/wxStyledTextCtrl/ScintillaWidget.h (+0/-55) deprecated/management/profile-editor/src/wxStyledTextCtrl/Style.cxx (+0/-154) deprecated/management/profile-editor/src/wxStyledTextCtrl/Style.h (+0/-56) deprecated/management/profile-editor/src/wxStyledTextCtrl/StyleContext.cxx (+0/-51) deprecated/management/profile-editor/src/wxStyledTextCtrl/StyleContext.h (+0/-169) deprecated/management/profile-editor/src/wxStyledTextCtrl/UniConversion.cxx (+0/-76) deprecated/management/profile-editor/src/wxStyledTextCtrl/UniConversion.h (+0/-12) deprecated/management/profile-editor/src/wxStyledTextCtrl/ViewStyle.cxx (+0/-289) deprecated/management/profile-editor/src/wxStyledTextCtrl/ViewStyle.h (+0/-106) deprecated/management/profile-editor/src/wxStyledTextCtrl/WindowAccessor.cxx (+0/-178) deprecated/management/profile-editor/src/wxStyledTextCtrl/WindowAccessor.h (+0/-57) deprecated/management/profile-editor/src/wxStyledTextCtrl/XPM.cxx (+0/-322) deprecated/management/profile-editor/src/wxStyledTextCtrl/XPM.h (+0/-72) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc.cpp (+0/-3398) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc.h (+0/-2410) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc_cw.h (+0/-4) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc_cw_d.h (+0/-4) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc_cwc.h (+0/-4) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc_cwc_d.h (+0/-4) |
To merge this branch: | bzr merge lp://qastaging/~sbeattie/apparmor/apparmor-deprecated-cleanup |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John Johansen | Approve | ||
Review via email:
|
Description of the change
This branch removes the deprecated/
To post a comment you must log in.
Looks good
Acked-by: John Johansen <email address hidden>