Commit graph

268 commits

Author SHA1 Message Date
Steve Harris
3b10c0e0b7 13.3.1-6.1 baseline
Former-commit-id: 3ea50babf5 [formerly 6d96471b9b] [formerly fa9d260c2b] [formerly 3ea50babf5 [formerly 6d96471b9b] [formerly fa9d260c2b] [formerly a062803c8c [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]]]
Former-commit-id: a062803c8c
Former-commit-id: f92bc8f3d4 [formerly 2e1dbdc10d] [formerly 38ded82c18c6e60a96a3dd85d4c9dd3d0ed218fe [formerly bfa25f3330]]
Former-commit-id: c57d4dca8ae0fdf1532461d5c287fa8b8cb94434 [formerly c038384685]
Former-commit-id: a5b96e0c3c
2013-03-13 08:28:26 -05:00
Steve Harris
ed1788343e 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171 [formerly 6fe4b16924] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a]
Former-commit-id: c28f3aeb02
2013-03-12 08:35:45 -05:00
Steve Harris
f20c87110e 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]
Former-commit-id: e26f7eb151
Former-commit-id: aabd5cd51f [formerly a240379588] [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]]
Former-commit-id: 8b4bd6790f2136380dbac557b452d873c77bacc6 [formerly 1f98e01c57]
Former-commit-id: 79ff805090
2013-03-05 10:47:06 -06:00
Steve Harris
52aae101cc 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]]
Former-commit-id: 2edca90902
Former-commit-id: 4bfbb518c0 [formerly 3e0614b43a] [formerly c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]]
Former-commit-id: e4eaa93661df211ab065d6c9dd5f042f5011f151 [formerly 0df35cc5ec]
Former-commit-id: 153aadc1d7
2013-03-05 10:39:59 -06:00
Steve Harris
7afe192a2e 13.3.1-3 baseline
Merge branch 'master_13.3.1' of ../ss_build_transfer_copy into master_13.3.1

conflicts resolved by 'theirs' strategy (all of 13.3.1-10)

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 786642589b [formerly 07167ec04f] [formerly cf951785c8] [formerly 786642589b [formerly 07167ec04f] [formerly cf951785c8] [formerly db761c0f19 [formerly cf951785c8 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]]]
Former-commit-id: db761c0f19
Former-commit-id: 9e33e5aed0 [formerly 988430b44d] [formerly e1e30a87bbefe4ace1cec506478f31b1c194a07f [formerly 62e15dacdb]]
Former-commit-id: 8a7424cb5ccac6a26cfe8489b629abcc460e0589 [formerly f14049cf3f]
Former-commit-id: 225af35fbe
2013-02-25 15:54:24 -06:00
Steve Harris
02f04a926e 13.3.1-3 baseline
Former-commit-id: 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]]
Former-commit-id: 8a64f142e5
Former-commit-id: 30efc4c86a [formerly 05eb25f124] [formerly ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3]]
Former-commit-id: 1fe55774d4f2229cf3fdf3a4a342eab88f5b63cd [formerly 1ba778753f]
Former-commit-id: 9da8db0212
2013-02-25 10:24:53 -05:00
Steve Harris
dbaeb28c82 13.3.1-2 baseline
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]]
Former-commit-id: 3d115ed3be
Former-commit-id: f2428e968a [formerly 370ed98038] [formerly 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]]
Former-commit-id: 6be2b60d013b857004e97817b3188f6eb4ae78f5 [formerly 2a2a9e03b7]
Former-commit-id: a43233f8c2
2013-02-25 10:18:36 -05:00
Steve Harris
067dfcb980 13.3.1-1 baseline
Former-commit-id: 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 96c7269df0 [formerly 0569ff413d] [formerly c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19]]
Former-commit-id: a43ccc92cdffebafcecdfdadcfc25825beb32b12 [formerly 654f15be5c]
Former-commit-id: 07e4e4c8fb
2013-02-21 09:36:59 -05:00
Steve Harris
1ade6a0241 13.2.1-8 baseline
Merge commit '1da0393' into master_13.3.1

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: f55ea02607 [formerly f5bd250026] [formerly 7f2b4a8092] [formerly f55ea02607 [formerly f5bd250026] [formerly 7f2b4a8092] [formerly 2f7bf90856 [formerly 7f2b4a8092 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]]]
Former-commit-id: 2f7bf90856
Former-commit-id: 6168846b97 [formerly 87bd35250c] [formerly 224ac801b740bcfa7e8f8edee78de977ecae225d [formerly a723531b31]]
Former-commit-id: a179a2ad8aebae6d91f8fbcfa9dbb678d1470f92 [formerly 8c5659e589]
Former-commit-id: 4d5ba22cc8
2013-02-21 09:25:27 -05:00
Steve Harris
fac2d20002 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
2013-02-20 16:19:40 -06:00
Steve Harris
7ed1b244e4 Merge branch 'master_13.2.1' into master_13.3.1
Former-commit-id: af78b95ef2 [formerly bbc1b6fb55] [formerly 1b631ebb9a] [formerly af78b95ef2 [formerly bbc1b6fb55] [formerly 1b631ebb9a] [formerly b29c0b805f [formerly 1b631ebb9a [formerly 8584d078529382aadd9f1eac527f89ea58808df1]]]]
Former-commit-id: b29c0b805f
Former-commit-id: 180a1877d2 [formerly 9a90ba3d07] [formerly 3de33935491ec507a0f77bd19520d42341e201f1 [formerly 15e9481838]]
Former-commit-id: a80ab5dde0827555cd5abf344844c0a3e4479dcb [formerly 38328aed51]
Former-commit-id: 59eb93efc3
2013-02-18 12:39:53 -06:00
Steve Harris
0b53108cbe 13.2.1-8 baseline
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]]
Former-commit-id: 053156f02e
Former-commit-id: db02d32440 [formerly 8cffb55371] [formerly 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]]
Former-commit-id: db6d42ff3ca25509616d69de95cc4fe49742d3a6 [formerly edac913af7]
Former-commit-id: 32ad300b47
2013-02-18 09:09:41 -06:00
Steve Harris
77dbde9e45 13.2.1-8 baseline
Former-commit-id: 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 535a9402a7 [formerly 27d88edcb9 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]]]
Former-commit-id: 535a9402a7
Former-commit-id: 825a99770d [formerly 58bafc0068] [formerly 0a9388f77add45c1702ce16113b0c20068e2d223 [formerly a68ce64f45]]
Former-commit-id: 0d9c5ea952e6d4f898bb127acdeb6807009e309c [formerly 7b6e374314]
Former-commit-id: 933e9f3f75
2013-02-18 09:23:06 -05:00
Steve Harris
f7f95968f3 13.2.1-7 baseline
Merge branch 'master_13.2.1' into master_13.3.1

Conflicts solved with 'theirs' strategy (all of 13.2.1-7)

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 831991e5e6 [formerly a67564bea7] [formerly a53a44d42c] [formerly 831991e5e6 [formerly a67564bea7] [formerly a53a44d42c] [formerly d9028f55d3 [formerly a53a44d42c [formerly 1108d28cc473cd1b6be7ec5c78e78c7b6d1ea56f]]]]
Former-commit-id: d9028f55d3
Former-commit-id: 8cc86b2bdf [formerly c75b30c245] [formerly 35df32bc088a1bcdc7102793402c5945ecdf2472 [formerly 5bf55de767]]
Former-commit-id: 43eb2d9265829b5e3f6a26b8545ec5943b77f0b1 [formerly 7b923d1891]
Former-commit-id: 09184a736d
2013-02-14 13:55:35 -06:00
Steve Harris
6f699a1518 13.1.1-10 baseline
Former-commit-id: 99a9726284 [formerly baa5de2147] [formerly 06d0e6dd16] [formerly 99a9726284 [formerly baa5de2147] [formerly 06d0e6dd16] [formerly 9b73b6a2a9 [formerly 06d0e6dd16 [formerly 1e337899d45617a8ee1998f2d2c86f2912668b67]]]]
Former-commit-id: 9b73b6a2a9
Former-commit-id: 08fc72ae79 [formerly a491a84615] [formerly 3f0e36d1330556a28b6d671489405442be1fc0cd [formerly c8c783f128]]
Former-commit-id: 01dc80797df89b0433d2123f8b465164abbaf772 [formerly ba12b38550]
Former-commit-id: 94d338ea0c
2013-02-14 13:24:43 -06:00
Steve Harris
d0f284ea56 13.1.1-10 baseline
Former-commit-id: 09fe656bcc [formerly eff75cc712] [formerly 56a36af0c2] [formerly 09fe656bcc [formerly eff75cc712] [formerly 56a36af0c2] [formerly 986c332e69 [formerly 56a36af0c2 [formerly d5639bcdf900c60d883eb975e3062ebc55803da1]]]]
Former-commit-id: 986c332e69
Former-commit-id: 5ac1d7558f [formerly 57ccd18d85] [formerly a4928406e5f63cc6b671a4fb535ce16b4d6216ac [formerly fa962f98a4]]
Former-commit-id: abeb58489a14c04b93612ff83ee4fdaf599d6f81 [formerly e0dc0fbfcc]
Former-commit-id: 8b3511b32f
2013-02-14 14:11:00 -05:00
Steve Harris
d0555c85c9 13.2.1-7 baseline
Former-commit-id: 934a76bd7e [formerly 0b7287b130] [formerly 6fad5da5ed] [formerly 934a76bd7e [formerly 0b7287b130] [formerly 6fad5da5ed] [formerly 9c23bf6e73 [formerly 6fad5da5ed [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]]]]
Former-commit-id: 9c23bf6e73
Former-commit-id: 1699141ca3 [formerly 6780b60df5] [formerly 026d981189675d233e618f3f607c027654752432 [formerly 6bfbfc8a5e]]
Former-commit-id: 3f62bf744d982dc3896f07fe513e27e80aeca64a [formerly 94dd16659a]
Former-commit-id: 2255fa6a05
2013-02-12 14:51:26 -06:00
Steve Harris
ee8bfc9941 13.2.1-7 baseline
Former-commit-id: c0b56ae597 [formerly 370b2558f0] [formerly 1ce95d1df2] [formerly c0b56ae597 [formerly 370b2558f0] [formerly 1ce95d1df2] [formerly c86246ab4d [formerly 1ce95d1df2 [formerly 132297ab4acf8e649e3cf9a3d54d4f4676b280be]]]]
Former-commit-id: c86246ab4d
Former-commit-id: f76444254f [formerly 4bc81ce1de] [formerly 487e22db3552e2e061b19f214b91446a1ad77f8e [formerly 37be2e3f23]]
Former-commit-id: 4e998b11e07806a3d1725189e94643feab1fbb68 [formerly 4c0a8e0106]
Former-commit-id: b2c3100109
2013-02-11 16:50:39 -05:00
Steve Harris
b43935a991 13.2.1-6 baseline
Former-commit-id: 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 5027d2365b [formerly bbe92e6824] [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d [formerly 30d38334cc]]
Former-commit-id: 0cd3f4b5889bda9de32b546358edf3d8210d3ad8 [formerly 0c128dd8f0]
Former-commit-id: dc55ef579a
2013-02-07 16:00:39 -06:00
Steve Harris
91ea402e4a 13.2.1-6 baseline
Former-commit-id: 9b7251d17e [formerly cc48fa4fc6] [formerly b80782b081] [formerly 9b7251d17e [formerly cc48fa4fc6] [formerly b80782b081] [formerly 53adfb7345 [formerly b80782b081 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]]]
Former-commit-id: 53adfb7345
Former-commit-id: 12e0cd07f2 [formerly 1f44caaedb] [formerly c2b93522588c69765c159821337fa509e477775e [formerly dee1480773]]
Former-commit-id: 18ada68ce3b5705ca7409e9672f65a4b86114240 [formerly 16b7b742be]
Former-commit-id: 46eee24352
2013-02-07 16:38:44 -05:00
Steve Harris
f4db8db3c6 13.2.1-5 baseline
Former-commit-id: e2b47a728a [formerly d6a9d68c10] [formerly a11ab8f26e] [formerly e2b47a728a [formerly d6a9d68c10] [formerly a11ab8f26e] [formerly d26a488ee4 [formerly a11ab8f26e [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]]]
Former-commit-id: d26a488ee4
Former-commit-id: 8c890bc52d [formerly 72ca459f76] [formerly 38010bc7076d42c73fff1e588beb826187f9ac6b [formerly 4a745c9483]]
Former-commit-id: 6914afab4d2489c8c78abcfb3f2ecf1063f60333 [formerly 62edcd29eb]
Former-commit-id: f8420bc7e1
2013-02-04 16:31:26 -06:00
Steve Harris
d935b8ee0b 13.2.1-5 baseline
Former-commit-id: 05c2ca86f4 [formerly 1a74d2f0c5] [formerly b4014794de] [formerly 05c2ca86f4 [formerly 1a74d2f0c5] [formerly b4014794de] [formerly f99f99e2f5 [formerly b4014794de [formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]]]]
Former-commit-id: f99f99e2f5
Former-commit-id: c0a6bcf215 [formerly 39cb931bc9] [formerly 3422292903b976eeee7ff48443c918b662079695 [formerly 418d8ca0d8]]
Former-commit-id: f1e95f619dc7a9c68e2f3bd58d6bdb5b76adb105 [formerly 256b596d88]
Former-commit-id: fdf67e8292
2013-02-04 16:36:29 -05:00
Steve Harris
bafb9234f2 13.2.1-4 baseline
Former-commit-id: ed224fde88 [formerly ae2859d5a2] [formerly 8f2e7d4437] [formerly ed224fde88 [formerly ae2859d5a2] [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly 8f2e7d4437 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: d6b48ca411 [formerly 3f25b862c8] [formerly 10a61c775941bb43691425e06f2cf4ac1116da55 [formerly 2998f750f4]]
Former-commit-id: 145f6b5c4d69d5e7db5b971374ee6cd59cc6e57e [formerly 0a4ef8c084]
Former-commit-id: 5ae95b956b
2013-01-31 11:40:31 -06:00
Steve Harris
552c6528eb 13.2.1-4 baseline
Former-commit-id: 5acf001c1b [formerly f2b28cfa56] [formerly 1beb655fa0] [formerly 5acf001c1b [formerly f2b28cfa56] [formerly 1beb655fa0] [formerly 1e77a6f0bd [formerly 1beb655fa0 [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]]]
Former-commit-id: 1e77a6f0bd
Former-commit-id: a3bd6e4aec [formerly 06f4b4ad5a] [formerly 8415524a4a291e13a736e0a26d38dc66c27a7bbd [formerly e6e4de6247]]
Former-commit-id: 2279711be5e623be8a80d9c3eec1bcd3be94f13e [formerly 0c67e2153f]
Former-commit-id: d52f193d7f
2013-01-31 12:05:59 -05:00
Steve Harris
613ea5ed5c Set branch 'master_13.2.1' to 13.2.1-3
Former-commit-id: 98955073fe [formerly 34af4107ec] [formerly 431c87fd41] [formerly 98955073fe [formerly 34af4107ec] [formerly 431c87fd41] [formerly 6970a8ab46 [formerly 431c87fd41 [formerly 8955b95e1587317abef2b1ca2a15ea801acd055a]]]]
Former-commit-id: 6970a8ab46
Former-commit-id: 0ba994597c [formerly 2f15451195] [formerly 7424b2c24edb85540505484c58dc703ef8707347 [formerly c1ec7ca271]]
Former-commit-id: 02801b06c2c022e3c5af5954f062e20cdf04f080 [formerly 89d956228c]
Former-commit-id: 6ee1d469b5
2013-01-24 10:20:13 -06:00
Steve Harris
de52fa3268 Set branch 'master' to 12.12.1-12
Former-commit-id: fad158bc97 [formerly bfd5c7f19c] [formerly a01f56909c] [formerly fad158bc97 [formerly bfd5c7f19c] [formerly a01f56909c] [formerly 71694006b1 [formerly a01f56909c [formerly 0bc0387279a73fa3175ada3a827e83b9ca2f58a4]]]]
Former-commit-id: 71694006b1
Former-commit-id: 57f10377f1 [formerly a02662c13f] [formerly 203f08294e0841ad1b878d14794f17589ef42148 [formerly 610b9dc2d8]]
Former-commit-id: 001319383fa2d9fd65102bc10fd2abe890d39745 [formerly bb7e40e57e]
Former-commit-id: d3bcb1af50
2013-01-23 15:41:59 -06:00
Steve Harris
264b5bb073 13.2.1-3 baseline
Former-commit-id: 7d2e979c51 [formerly a5a0da5c02] [formerly 7435527b25] [formerly 7d2e979c51 [formerly a5a0da5c02] [formerly 7435527b25] [formerly 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: d069467e81 [formerly 9d248cff7a] [formerly 32e4736725f3f6d880854f4dba7503e4939e28b7 [formerly cc0fdef15c]]
Former-commit-id: 1062fcca38400bed252816a16308c04554196b61 [formerly 082e66584a]
Former-commit-id: ab562e22a4
2013-01-23 11:24:17 -05:00
Steve Harris
b92dfd1b62 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
2013-01-23 11:18:44 -05:00
Steve Harris
2c834d0f58 13.2.1-1 baseline
Former-commit-id: 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 1d1791b3b4 [formerly 8ed6a53113] [formerly b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf]]
Former-commit-id: c7cd6e75591b001d138f41ea10b2ed691477e255 [formerly 9146e727f9]
Former-commit-id: 08bf724a6c
2013-01-23 11:13:03 -05:00
Steve Harris
f3e43ecb33 13.1.2-10 baseline
Former-commit-id: 5b617e763b [formerly 683193255d] [formerly 68dde17de2] [formerly 5b617e763b [formerly 683193255d] [formerly 68dde17de2] [formerly 86ea0b666e [formerly 68dde17de2 [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]]]
Former-commit-id: 86ea0b666e
Former-commit-id: b4a3933e87 [formerly 39f9dc931a] [formerly 9f07f7e014b3a205684780ddaf335bdd9b824c4d [formerly d148beb4ca]]
Former-commit-id: 18d303aa6094230a2a8aa0f0954b1705a38382d5 [formerly 5c488932d9]
Former-commit-id: 18b7633b70
2013-01-18 10:37:25 -05:00
Steve Harris
9c1503705f 13.1.2-9 baseline
Former-commit-id: a78d3ab456 [formerly 6fd587d08d] [formerly 0878a7ea57] [formerly a78d3ab456 [formerly 6fd587d08d] [formerly 0878a7ea57] [formerly ddc6aec013 [formerly 0878a7ea57 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]]]
Former-commit-id: ddc6aec013
Former-commit-id: 71267d323e [formerly 5b752c12c4] [formerly a5350d4f640abae2d8766048e2614c8856764e55 [formerly 5e0a9a8fd2]]
Former-commit-id: 10033ea9a32de8b75ea1faebccacd5e638ad55e1 [formerly 3f93a9eb2e]
Former-commit-id: b9cd443717
2013-01-18 10:29:52 -05:00
Steve Harris
32c48861de 13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 13be9f8987 [formerly 7d0109a349] [formerly d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]]
Former-commit-id: 93a11a781554c0d3f113b98ce41624b35a753e8d [formerly 066c14dcd2]
Former-commit-id: 92f1e9416c
2013-01-11 16:19:07 -05:00
Steve Harris
005d9ccae2 13.1.2-7 baseline
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]]
Former-commit-id: 42189b5f88
Former-commit-id: 4c8e604619 [formerly f1256f2a9e] [formerly 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]]
Former-commit-id: bc0b5a7bf290d46a49a6251bcf649c05a7b9d563 [formerly 775a338b90]
Former-commit-id: 1ef10eaf2c
2013-01-11 16:12:09 -05:00
Steve Harris
3e63f280a2 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
cedbde75e3 12.12.1-12 baseline
Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 79b0e973ef [formerly 69ab975fab] [formerly 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]]
Former-commit-id: 54c80ccffc60d6ee8a544b475ed12355b32a2f26 [formerly 190378beeb]
Former-commit-id: f8a9ae24cb
2012-12-06 09:18:28 -06:00
Steve Harris
25facfa9a7 12.12.1-10 baseline
Former-commit-id: 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 45f5150eb6 [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]]
Former-commit-id: 28018b8d9b
Former-commit-id: d2da55254b [formerly 8a41d325d2] [formerly e0830ae197e0ce5e3085d3fffa18fe7132792d42 [formerly 0c67cb78a3]]
Former-commit-id: b37b8565f1ec8f0e35f587d2337f734e0608c210 [formerly 8ada406bfe]
Former-commit-id: a10d7d3041
2012-12-06 09:12:15 -06:00
Steve Harris
5f22640e99 12.12.1-8 baseline
Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]]
Former-commit-id: 5093a7c442
Former-commit-id: a45a7fe1bf [formerly ff4131c2ee] [formerly 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]]
Former-commit-id: d1f389a14d75a14807b83f7528cff619dda45f17 [formerly ec2cdc1593]
Former-commit-id: 0b22b3c014
2012-12-06 09:02:51 -06:00
Steve Harris
ccb16b9b44 12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]]
Former-commit-id: 57578da521
Former-commit-id: 4300583fc2 [formerly e35a321a8c] [formerly 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]]
Former-commit-id: 83b699079d09b1ae989d5d92097f6ebe23a8c242 [formerly 493f335c0b]
Former-commit-id: 2c2bfc949d
2012-11-14 14:19:20 -06:00
Steve Harris
f21d879641 12.12.1-3 baseline
Former-commit-id: 48fa2a9106 [formerly a81c46987b] [formerly c999505fba] [formerly 48fa2a9106 [formerly a81c46987b] [formerly c999505fba] [formerly b3b5e6d28f [formerly c999505fba [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 5f628acefd [formerly 2e3662028f] [formerly b188535ef6619becad681ca44d5bacd7a27bb351 [formerly 2797cbcdd0]]
Former-commit-id: 379f849720c82d98605dec3a6a94876bfa6a52fb [formerly 314495dc8e]
Former-commit-id: 7058ebec23
2012-11-13 17:27:04 -06:00
Steve Harris
9e4dbe2640 12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 5365b72401 [formerly 111e7607cf] [formerly 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]]
Former-commit-id: 0a26a9f757bec6107dd0eb5024ce9aaf5d84b865 [formerly 96a4a4f3f5]
Former-commit-id: 53d74c66e7
2012-11-13 17:14:24 -06:00
Steve Harris
94cd5a1388 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de]
Former-commit-id: af59663a99
2012-11-07 12:41:20 -06:00
Steve Harris
6c48aaeda6 12.11.1-12 baseline
Former-commit-id: 7f6baf2e24 [formerly 565756567f] [formerly 8682e4f6ca] [formerly 7f6baf2e24 [formerly 565756567f] [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 89940e8fed [formerly d8b6157aab] [formerly 1acfe145013f9afdd8c598af509871593462a766 [formerly 314c03e7b6]]
Former-commit-id: 46aec701f4c85f6b083e2354a854e34621b6523a [formerly 09f6e43195]
Former-commit-id: a9e1b01ad7
2012-10-29 12:15:56 -05:00
Steve Harris
31f4d435fa 12.11.1-10 baseline
Former-commit-id: 7779b584c0 [formerly 63dddc5f5f] [formerly e845c605e6] [formerly 7779b584c0 [formerly 63dddc5f5f] [formerly e845c605e6] [formerly 0ba69044a2 [formerly e845c605e6 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]]]
Former-commit-id: 0ba69044a2
Former-commit-id: e7a5f938d5 [formerly 61224dec54] [formerly 6fcb4f94c3d3270f1daa5300ab582f30625bdf7c [formerly cc21977c35]]
Former-commit-id: 828641fdb972b87922811423dc1701994a2d5fea [formerly 19c4526e61]
Former-commit-id: 03c572edba
2012-10-24 15:13:57 -05:00
Steve Harris
056baad808 12.11.1-7 baseline
Former-commit-id: 59e5b55b96 [formerly 40a5bc1683] [formerly d8ca6b9005] [formerly 59e5b55b96 [formerly 40a5bc1683] [formerly d8ca6b9005] [formerly 79a5638de9 [formerly d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]]]
Former-commit-id: 79a5638de9
Former-commit-id: 320a29466d [formerly efba080b9c] [formerly 901f56658eaeddda857d877834f967b14c2f861c [formerly cfd228f0d7]]
Former-commit-id: c0d6c794fa054693cb0037318fdbd31ace4531a3 [formerly 572085c119]
Former-commit-id: 26badd258f
2012-10-23 16:40:50 -05:00
Steve Harris
2d368b5b0b 12.11.1-6 baseline
Former-commit-id: 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: ae73939b02 [formerly 8beb6fc0b8] [formerly 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14]]
Former-commit-id: bfbc6b62be31cb07dee1061fd2ffeb9b2a9e932a [formerly 4f27cbb406]
Former-commit-id: 9c597c7060
2012-10-18 15:53:01 -05:00
Steve Harris
92be4d5105 12.11.1-5 baseline
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]]
Former-commit-id: a0eaf651ff
Former-commit-id: dfdf01de85 [formerly 85ad066b70] [formerly 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba]]
Former-commit-id: 90ed5b647bfe3dc11c44294f7a83b7e770575415 [formerly dff8d5de9c]
Former-commit-id: 13cdd55545
2012-10-18 15:46:42 -05:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00
Steve Harris
e42c12350b 12.11.1-3 baseline
Former-commit-id: a65c057df5 [formerly 196afa0e5f] [formerly 2d0c424713] [formerly a65c057df5 [formerly 196afa0e5f] [formerly 2d0c424713] [formerly 5d796f775c [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]]
Former-commit-id: 5d796f775c
Former-commit-id: 7fcbb49a3e [formerly 725b2f8ba5] [formerly 0e268084394b033a5de6dba694d14423a1da3040 [formerly 5723fb0031]]
Former-commit-id: eaae8c3b883f287ffd1c17522c62444fa45a6410 [formerly bf1f88482b]
Former-commit-id: c25ebcdc41
2012-10-15 16:30:31 -05:00
Steve Harris
75d99f4e93 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 6e0b2c55d7 [formerly 772c60efa4] [formerly 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc]]
Former-commit-id: 8fe8231e2d1c3ba8a832320dad34957e6a59e8fe [formerly e72b6d5da6]
Former-commit-id: ff9321e3ce
2012-10-08 13:26:20 -05:00