rebase patches

This commit is contained in:
Orion Poplawski 2014-04-04 09:44:30 -06:00
parent 491914b7e0
commit 25463ee3bb
2 changed files with 6 additions and 6 deletions

View File

@ -1,6 +1,6 @@
--- cmake/Modules/FindwxWidgets.cmake.backup 2013-05-11 07:38:56.191581120 -0500 --- cmake-3.0.0-rc3/Modules/FindwxWidgets.cmake.orig 2014-03-20 10:50:27.000000000 -0600
+++ cmake/Modules/FindwxWidgets.cmake 2013-06-03 09:40:35.178161023 -0500 +++ cmake-3.0.0-rc3/Modules/FindwxWidgets.cmake 2014-04-04 09:34:41.194072417 -0600
@@ -201,10 +201,10 @@ @@ -230,10 +230,10 @@
#===================================================================== #=====================================================================
#===================================================================== #=====================================================================

View File

@ -1,6 +1,6 @@
--- cmake-3.0.0-rc1/Modules/FindRuby.cmake.orig 2014-02-26 08:41:21.000000000 -0700 --- cmake-3.0.0-rc3/Modules/FindRuby.cmake.orig 2014-03-20 10:50:27.000000000 -0600
+++ cmake-3.0.0-rc1/Modules/FindRuby.cmake 2014-03-05 10:09:49.692974698 -0700 +++ cmake-3.0.0-rc3/Modules/FindRuby.cmake 2014-04-04 09:34:41.177072542 -0600
@@ -112,14 +112,8 @@ @@ -115,14 +115,8 @@
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)