Permalink
Browse files

Merge with e2.

  • Loading branch information...
2 parents d8cc450 + 6d1a4b4 commit 3905b67d52e0a51c21a6f7f2491efa90877d268f @ajpalkovic ajpalkovic committed Oct 8, 2010
Showing with 9,963 additions and 2,240 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 ecore/Catalyst.h
  3. BIN ecore/ecore.lib
  4. BIN ecore/ecored.lib
  5. +607 −0 src/ApiHandler.cpp
  6. +115 −0 src/ApiHandler.h
  7. +29 −0 src/BundleItemEditorCtrl.cpp
  8. +1 −0 src/BundleItemType.h
  9. +24 −2 src/BundlePane.cpp
  10. +4 −1 src/BundlePane.h
  11. +1,488 −0 src/CommandHandler.cpp
  12. +121 −0 src/CommandHandler.h
  13. +77 −0 src/CommandPanel.cpp
  14. +49 −0 src/CommandPanel.h
  15. +5 −0 src/DiffPanel.cpp
  16. +1 −0 src/DiffPanel.h
  17. +65 −12 src/Document.cpp
  18. +10 −3 src/Document.h
  19. +6 −0 src/EditorBundlePanel.cpp
  20. +1 −0 src/EditorBundlePanel.h
  21. +1,699 −398 src/EditorCtrl.cpp
  22. +119 −17 src/EditorCtrl.h
  23. +125 −11 src/EditorFrame.cpp
  24. +37 −2 src/EditorFrame.h
  25. +1 −1 src/Env.cpp
  26. +1 −0 src/FindFlags.h
  27. +3 −0 src/IEditorDoAction.h
  28. +1 −0 src/ITabPage.h
  29. +5 −1 src/Lines.cpp
  30. +30 −0 src/Macro.cpp
  31. +152 −0 src/Macro.h
  32. +231 −0 src/MacroPane.cpp
  33. +65 −0 src/MacroPane.h
  34. +29 −3 src/PreviewDlg.cpp
  35. +1 −0 src/RemoteThread.h
  36. +1 −4 src/RunCmdDlg.cpp
  37. +4 −4 src/SettingsDlg.cpp
  38. +11 −7 src/ShellRunner.cpp
  39. +38 −7 src/SnippetHandler.cpp
  40. +6 −2 src/SnippetHandler.h
  41. +9 −0 src/Strings.cpp
  42. +4 −0 src/Strings.h
  43. +67 −0 src/WindowEnabler.h
  44. +7 −7 src/e-exe/e-exe.vcproj
  45. +2 −2 src/e.iss
  46. +1,828 −1,680 src/e.vcproj
  47. +40 −28 src/eAbout.cpp
  48. +3 −0 src/eAbout.h
  49. +42 −8 src/eApp.cpp
  50. +18 −1 src/eApp.h
  51. +34 −0 src/eConnection.cpp
  52. +44 −0 src/eConnection.h
  53. +1 −2 src/eDockArt.cpp
  54. +7 −2 src/eDocumentPath.cpp
  55. +41 −0 src/eIpcThread.cpp
  56. +46 −0 src/eIpcThread.h
  57. +27 −0 src/eServer.cpp
  58. +25 −0 src/eServer.h
  59. +3 −1 src/eSettings.cpp
  60. +1 −0 src/eSettings.h
  61. +211 −0 src/hessian_ipc/connection.cpp
  62. +81 −0 src/hessian_ipc/connection.h
  63. +22 −0 src/hessian_ipc/connection_manager.cpp
  64. +27 −0 src/hessian_ipc/connection_manager.h
  65. +453 −0 src/hessian_ipc/hessian_reader.cpp
  66. +89 −0 src/hessian_ipc/hessian_reader.h
  67. +465 −0 src/hessian_ipc/hessian_values.cpp
  68. +335 −0 src/hessian_ipc/hessian_values.h
  69. +69 −0 src/hessian_ipc/hessian_writers.h
  70. +47 −0 src/hessian_ipc/proxy.cpp
  71. +59 −0 src/hessian_ipc/proxy.h
  72. +70 −0 src/hessian_ipc/server.cpp
  73. +45 −0 src/hessian_ipc/server.h
  74. +1 −0 src/matchers.h
  75. +256 −22 src/plistHandler.cpp
  76. +19 −2 src/plistHandler.h
  77. +14 −7 src/styler_searchhl.cpp
  78. +2 −1 src/styler_searchhl.h
  79. +56 −1 src/styler_syntax.cpp
  80. +2 −0 src/styler_syntax.h
  81. +7 −0 src/tmAction.h
  82. +205 −1 src/tm_syntaxhandler.cpp
  83. +15 −0 src/tm_syntaxhandler.h
View
@@ -54,6 +54,7 @@ external/pcre/
external/tinyxml/
external/wxwidgets/
external/webkit/
+external/boost/
# Ignore licensing files copied over to enable tests
e.cfg
View
@@ -387,6 +387,7 @@ class Catalyst {
// Registration functions
bool IsRegistered() const;
+ bool NeedLicenseUpdate() const;
bool IsExpired() const;
int DaysLeftOfTrial() const;
int TotalDays() const;
View
Binary file not shown.
View
Binary file not shown.
Oops, something went wrong.

0 comments on commit 3905b67

Please sign in to comment.