labofsahil/github-event-dataset-2012 huggingface dataset:
Add support for vector = [array,literal] expressions. (cherry picked from commit 7ada3d95b8af1b271d82f1ec5208f0b689eb143c)
Fix VectorExp to handle non-const array literals. (cherry picked from commit 9402516e0b07031e841a15849f5dc94ae81dccdc)
Remove useless function attributes. (cherry picked from commit 2b4dc1ac0d7b8dff64df632171bf824ecb715c87)
Set proper size_t type on compiler init. (cherry picked from commit 5a365027a79a1b13ce14b45fd105153bf1985188)
Remove d-bi-attrs.h - move common frontend attributes to d-builtins.c (cherry picked from commit a9bf5675cea82ad458350d4683b4a1ce4ad649c5)

Conflicts:
	gcc/d/Make-lang.in
	gcc/d/d-bi-attrs-47.h
	gcc/d/d-builtins.c
Update patches for gcc-4.8.x, re-merge patch scripts back into one setup-gcc.sh.

Conflicts:
	gcc/d/patches/patch-gcc-4.8.x
	gcc/d/patches/patch-toplev-4.8.x
	gcc/d/setup-gcc.sh
Add missing setup-gcc.sh script (cherry picked from commit 5e24c52991387b5c27db180123fab9e14b4ec6d4)

Conflicts:
	libphobos/configure
Remove broken weakref attribute. (cherry picked from commit cd8bb6d03ae3134a4976689eab312e2bb57701fc)
Sync unwind implementation with gcc. (cherry picked from commit 3292afbcfff3e90fe53b9145992056f92e2975f2)

Conflicts:
	gcc/d/d-builtins2.cc
Bug #15 - ICE in expand_expr_real_1, at expr.c (cherry picked from commit 20c0b776702947a338afc953ba35234425994c65)
Remove redundant gdc.1 (cherry picked from commit d253e497342cd15602bc74ae0bbe5923c8ae8020)
Fixup merge for ARM fsection-anchors fix.
(cherry picked from commit 237023bf9ecc603e437dbade8658bf0cbd905b31)
Add in basic support for EXECUTE_ARGS in testsuite. (cherry picked from commit a43144392cea4857d4ef4940256d8b3432e58b00)
Fixes Bug #19 - error: non-trivial conversion.
(cherry picked from commit bab24a82d7079686375a74b017752cfdfc082ffc)
ARM EH fixes. (cherry picked from commit 79ac75cf97fb8d50e4de6fe8e1508f7d7273738b)
More ARM EH fixes.
Rename TARGET_ANDROID macro

GCC sometimes defines it's own TARGET_ANDROID macro which
evaluates to a runtime expression so we can't use it.
Rename our TARGET_ANDROID TARGET_ANDROID_D to avoid clashes
Permissions modification 755 -> 644
Patches required for MinGW
Extracts dmain.o from libphobos. Required for WinMain and DllMain support
Necessary MinGW TLS code
Force use of C99 stdio functions within phobos
MinGW implementation of flockfile and funlockfile
Changes all architect neutral Win32 blocks to Windows
Corrects issue with 64-bit builtins on Windows
Adds dependency requirement for WinSock2
Marks ModulInfoZ as DLL_EXPORT/DLL_IMPORT for issue #288
Automated build script for MinGW builds
Add fiber assembly code for MinGW32/MinGW64
Make fiber_switchContext naked. Prologue was not generated with -O2. Using fix from https://bitbucket.org/goshawk/gdc/issue/349/caller-of-naked-function-marked-as-naked
Update build script to use a file called state. To determine build phase.
Fixes issue #355. https://bitbucket.org/goshawk/gdc/issue/355
Testcase for issue 355
Fixes #352. https://bitbucket.org/goshawk/gdc/issue/352
Fix typo. TARGET_WINDOWS -> TARGET_WINDOS.
Build script update
Update TLS patch for MinGW/GCC 4.6.1
Merge pull request #93 from vi4m/master

Radomir's typos fixed
Workaround for normalize_owner
Fix include links in rdoc

They are not supported by GitHub or RDoc.info

Signed-off-by: Vlad <vgit@vladgh.com>
Change app id back to JSA.
Enable prompting to install on iPhone
Switch to 1.7.1 AppEngine sdk
Convert links to a jsp so that it works on prod server
Increment version
App version 3.
Add datastore indexes. Add favicon.ico (doesn't work for
some
reason)
working on extrapolation
buddies: added BuddyPreferredManager::preferredContact2 method

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
chats: removed ChatTypeContact::findChat(Buddy) method, use ChatTypeContact::findChat(Contact) instead

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
buddies: added BuddyPreferredManager::prefferedContacts method

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
chas: removed ChatTypeContactSet::findChat(BuddySet) method, use ChatTypeContactSet::findChat(ContactSet) instead

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
message: extracted createOutgoingMessage private method in MessageManager

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
jabber: fixed documentation formatting for JabberVCardService

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
gadu: do not require Account instance in GaduAvatarUploader

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
gadu: pass id to GaduAvatarFetcher in fetchAvatar method

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
jabber: set PepService and VCard service on JabberAvatarUploader

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
jabber: updated JabberAvatarUploader to not use Account

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
avatars: do not use Account instance in AvatarService objects

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
avatars: AvatarService documented

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
documentation: do not create docs for libiris

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
avatars: documented GaduAvatarService and JabberAvatarService

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
starting warping menu...
working upstart script template
check for nodejs binary existence
Balanced adjustment.
Migrate from sqlite to mysql
More stars
Test
Make generator defaults public values
Adding BeanMediator deserializer

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@149837 a5903396-d722-0410-b921-86c7d4935375
Adding missing property

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@149838 a5903396-d722-0410-b921-86c7d4935375
Fixing TOOLS-1427

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@151385 a5903396-d722-0410-b921-86c7d4935375
Fixing TOOLS-1427

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@151386 a5903396-d722-0410-b921-86c7d4935375
Fixing CEP bucket packaging name

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@141776 a5903396-d722-0410-b921-86c7d4935375
Added sockjs-client 0.2.1
Add jquery.transit 0.1.3

jquery.transit is a jquery plugin that let you animate stuff
with css3 transformations and transitions using the same syntax as
animate.

License: MIT
Author: Rico Sta. Cruz
Homepage: http://ricostacruz.com/jquery.transit/
Add hashgrid
Add kerning.js
Added less-1.3.0.min.js and updated less.js's package.json
twitter-bootstrap -> 2.0.2
Updated Require.js to 1.0.7
Updated Require.js to 1.0.7
Added backbone.js/0.5.3/backbone-optamd-min.js - AMD optimized branch of Backbone (v0.5.3)
updating highcharts.js to v2.2.1
Merge pull request #193 from allnightlong/master

twitter-bootstrap 2.0.2
Added backbone.js/0.9.1-amdjs/backbone-amd-min.js - AMD optimized version of backbone.js

Added underscore.js/1.3.1-amdjs/underscore-amd-min.js - AMD optimized version of underscore.js
added hogan.js, a mustache compiler
Update d3 to release 2.8.1
Added jquery 1.7.2.
Updated Raphael.js to 2.1.0
Merge pull request #197 from Aaunel/master

Added AMD-Compliant versions of BackboneJS and UnderscoreJS
Merge pull request #192 from rdingwall/master

Update less-1.2.1.min.js to less-1.3.0.min.js
Merge pull request #202 from sguolin/master

Raphael.js 2.1.0
Merge pull request #201 from iynaix/master

Updated jQuery to 1.7.2 and Added spin.js
Basic Markers are working

Press Space or Click Button to create new Marker. Marker includes
current video time.

Basic video control buttons are working
Store compilation result to S3 (ref #11).
Add mock module for S3Storage.
Remove trace print.
Store request status, also (ref #11).
Implement recall feature with poor representation, anyway (ref #12).
HTML escape on source.
Enable to use short URL (ref #36).
Show permalink URL of result (ref #12).
Add trigger to show result list (see #35).
Cut out HTML to external templates.
Start to implement request list feature.
Implement minimum result list feature.
Do not use Base64Like encoding to adapt S3 filelist order.
Use SyntaxHighlighter and jQuery iframe auto height plugin.
Add compile host stats.
'bla'
Merge branch 'master' of https://github.com/yarivz/wdm
VARIABLE SAVE: log errors -3
FIX: odhelper.get_globalCVs
* testsTricks
* managed assets
* handsParams à l'applet
remove dups added in r742
properly export variables to not upset client.mk builds
simply add -lcxxrt to common libs
cut down on the number of substitutions
remove obsolete patch for system plugins
Removed hem dependency.
Display help by default
Use plain javascript in default project.
Updated test harness.
Updated die version.
link to problem that started time.js
[FIX CI] Szenario: Aushändigung mit Gegenständen teilweise ohne Zweck können durchgeführt werden
moved uncommited feature to upcoming/upload.feature
	modified:   features/examples/current/upload.feature
  new file:   features/examples/upcoming/upload.feature
Fixing some typos.
Include Piwik tracking bug if it's present on the server.
Attempting to fix test.
Merge branch 'feature_fix_permission_preset_form' into to_merge
typo
Improved README (DB Setup)
Revert "using update_column instead of update_attributes"

This reverts commit 3af2218430ee42da42886d6b1da5e85b5a1d6455.
changing everywhere MetaKey#object_type ot #meta_datum_object_type and adapting code consequently
fixing copyright deserialized_value
Merge branch 'experimental' into nightmare
Merge branch 'to_merge' into nightmare
Fixing ActiveRecord-related deprecations.
Step for making db dump/restore dry (pg)
more cleanup
Merge branch 'nightmare' of github.com:zhdk/madek into nightmare
fixing spec
filter panel doesn't submit media_resource_ids anymore
type + media_type on media set popup items (level down and level up items)
Try to fix: "Create a group and assign people to it" (timing issue??)
fix media resource total children
Output latex to pdf
continue with new types
continue with new types: html generation ported
continue porting to new types;
some fixes in tries, generation of html pages, ...
re-added update and retrieve method
Correctly reset permutation/translation during permutation
Added logging to permutation patcher
Added setCurrentPermutation() (somewhat internal) and getStaticPermutation(). Both are used by the output manager to create kernels respecting statically configured fields. Issue #100.
Added logging for permutation patcher
Tweaked permutation handling for kernel to use all statically configured fields there as well. Fixes bug #100.
Implemented updated footer
Added .gitignore
Merge branch 'master' of https://github.com/2quader/b-X
different naming for metric names, use only _
Minor compiler bug
Made this more consistent
Modified this to be a broader poke
Merge branch 'alpha' into alpha-lime
Installer for base. Includes true-sized sprites and lack of dummy sprites
Highlght dart core interfaces

Highlight all interfaces listed on the dart:core page:
http://api.dartlang.org/dart_core.html
更改了部分文件的引用路径

Change-Id: Ic97c9b402b04373baa18aa9540d11e4bc899e1de

DateUtils测试  
Change-Id: Iff13db3e55a8b893ee460dba662cb33d1d858a22
некоторые совсем небольшие изменения кода
fixes #217
Merge branch 'master' of github.com:Araq/Nimrod
Implement multiple service support to Bugzilla API

This diff introduces a "Service" class that namespaces each bugzilla
service and sets the proper __service_url__ global on the API module.

Usage is as follows:

    from pyresto.apis import bugzilla

    bugzilla.mozilla.Bug.get('774141')

Any bugzilla service that is not predefined can be defined as follows:

    my_service = bugzilla.Service('my_service', 'https://api.bugzilla.myserver.com')
    my_service.Bug.get('3141592')
Merge pull request #31 from BYK/bugzilla-v2

Implement multiple service support to Bugzilla API.
Fix line number references to github module in github.core
Finalize front-end for authentication system with documentation

Finalize the structure and methods used for authentication in pyresto and provide docs
along with them to make development easier.
Added ExistsRow method
Erste Version des Layouts
missing css in last commit?
Support MEF in the Logging projects. Add FileLogger and CachedFileLogger projects into the Loggings.
Split some basic UnitTesting tools into a new project.

Signed-off-by: BigEgg <cd_bigegg@hotmail.com>
KV2DBLayer: Small touches to compaction tuning
DB更新、訂閱電子報任務
背景淡化 及邊框細節調整 css
Interim for data memory implementations

added DataMemModifier.v
Initial commit of ScriptBuilder project
cw : ignore .chef
Update src/wtbox/util/WaitTool.java

minor change in comment
vamoss
vamoss
broke the game, and finished it at the same time
1. eliminado antiguo load.php
2. añadido config.php (maneja configuraciones)
3. creado cs_base.php (futuro desarrollo)
4. creado view.php (incompleto)
cleaned up a left over instruction that was no longer valid from a previous edit
Return a filename slug.
deleted:    denominator.py~
Added specbuffers.txt : describes all specials buffers
remove rest_card_controller and spec, will come back later integrated with card
Remove debugging, cleanup typecodes
Set some empty string variables in CCPUInfo to "N/A".
Fixes certain test cases for TestCPUInfo.
Fix actions for move/copy when destination set is actually a file.
Fix test case for new handling of ActionCopy.
Fix typo in test case for TestFileOperationJob.ActionDelete.
Fix TestFileOperationJob.ActionCreateFolder test case.
Include check for ActionDeleteFolder action to delete folders.
Fix TestFileOperationJob.ActionDeleteFolder test case.
Fix TestFileOperationJob.GetFunctions test case.
Close temp files after creating them in TestFileOperationJob test cases.
Allow setting the default "N/A" strings for all platforms.
Merge pull request #1433 from amejia1/testsuite

Fixes for CFileOperationJob and CCPUInfo classes
Moved the OnAction handling for Show_Internal to the mixin. Added the OnDeinitWindow to the WindowXML class. changed a few upcalls to skip the interceptor.
Separated the MakePendingCalls from the delayed call functionality.
Use the newly separated MakePendingCalls and delayed call correctly in the sleep call.
Removed the windowCleared flag since it wasn't being used. Moved most of the destructor into deallocating so it will be able to execute prior to child classes being partly destroyed. Take into account the newly separated delayed call and MakePendingCalls.
[cosmetic] Added some additional TRACE points and a note about the use of OnDeinitWindow since I keep forgetting it myself.
turn back off trace logging.
deallocating needs to unhook the Interceptor or it may call methods on a deleted window.
[pvr] configure and build pvr add-ons if the tree is found in /pvr-addons, so these can be built and run within the tree.
[fix] prevent 'deallocating' from running more than once.
fix weekend forecast
[fix] memory leak in AudioEngine.
[fix] Memory leak of the CLibcdio. Now using a boost::shared_ptr to track.
[fix] leak in anination/Tweem/VisibilityEffect using referenc counting.
[fix] leak in LircButtonMapEntries.
[fix] partial fix for leaks of JSONRPC meta-data. There are circular shared_ptr references that need to be sorted out before this will work properly.
added a number of the settings collections to be cleared in the Clear method for better memory management.
[fix] use the cleanup code that was added in the previous fix from the CApplication shutdown.
get rid of the setting not found log spam
use CFileItem::IsSamePath() to match the item in OnPlayAndQueueMedia, and set the original_listitem_url for bluray selection. fixes #13762
Merge pull request #1946 from jimfcarroll/fix-several-memory-leaks

Fix several memory leaks
[droid] Fix signing of APK with recent java/jarsigner versions
[lang] update of core language files for RC2
[lang] update of internal addon language files for RC2
[lang] added langinfo.xml file for new language Balarusian
Merge pull request #1952 from jmarshallnz/onplayandqueuemedia

use CFileItem::IsSamePath() to match the item in OnPlayAndQueueMedia
[osx/vda fixed again, force vda to use Eden method of rendering for Frodo
fix some invalid videodb:// URLs in CEdenVideoArtUpdater
Clear out a setting control when they're removed
use a smart ptr for the BaseSettingControl pointers so that they stay alive after window close if they're still being used. fixes #13766
Revert "change news and notice show"

This reverts commit 85c1a05b82d46e7c5c8f7ae8b13c3414192b9b3e.
initial commit
Merge https://github.com/Gryzorz/FSM
Reset PW 1/2 en temp table headers
Merge branch 'master' of https://github.com/ICTM1E1/KBS
Auto upcase address_state and address_country attrs of Payer
Derping it up.
STYLE: Fixed numerous style error in PatchBased denoising

The following command was run:

uncrustify -c
~/src/ITK-gerrit/Utilities/Maintenance/uncrustify_itk.cfg -l CPP *.hxx
*.h --replace

Change-Id: Ieec9d7471ddc7b13f1df917cdb91d48b4ef5e661
Merge topic 'FixPatchBasedDenoisingStyle'

ff2ff5e STYLE: Fixed numerous style error in PatchBased denoising
ENH: A2D2 Physics-Based Non-Rigid Registration

Combined submission of all topics

Moved mesh reader files to PBNRR test, removed unnecessary files.

Fixed segmentation fault in BM test, updated FS and BM baselines.

Rename variables

Fix warnings in itkFEMSolver and itkFEMRobustSolver

Add test for itkFEMRobustSolver, fix bug in itkFEMSolver

Feature selection: style fixes, removed specialization, put in concept checking.
Renamed itkVTKUnstructuredGridReader as itkVTKTetrahedralMeshReader.
Fixed API of itkMeshFileTestHelper.
Fixed Coding Style of itkVTKTetrahedralMeshReader related files.

Improving readability and style in itkMaskFeaturePointSelectionFilter.
Updated baseline image for test output of itkMaskFeaturePointSelectionFilter.

Reviewed the FEMRobustSolver and adjusted API to the FEMSolver.

Change-Id: I470585e42cbf752c4b4e6e4324369188389f9c9f
Merge topic 'PBNRR-Combined.p10'

a332ece ENH: A2D2 Physics-Based Non-Rigid Registration
DOC: Fix warning on ITKExamples Dashboard.

itkDeclareExceptionMacro was not defined in doxygen configuration file.

Change-Id: I07698b74130bb9d87e6548bcfbd8d0f9a10ff24c
Merge topic 'FixDoxygenWarningInTAGFile'

11e5cee DOC: Fix warning on ITKExamples Dashboard.
DOC: Fix PipelineMonitorImageFilter class doc spelling.

Change-Id: I015a7515099d98e8cd518636d916dbcb83a27aae
Merge topic 'PipelineMonitorSpelling'

64942fb DOC: Fix PipelineMonitorImageFilter class doc spelling.
COMP: Fix Spatial Object Test Segfaults

This bug fixes some segfaults that occur when compiling with O3 on gcc
4.7. I am not 100% sure why this works. ComputeMatrix looks fine, just
that it is a bit unusual to use the final counter value of the for
loop as a condition in the next if. I am thinking gcc does some
for-loop branching optimization that does't like this.

Change-Id: Ibcffbb70261b2675c9471aa3f04bbf6cde9140b2
Merge topic 'ScalableAffineTransformRefactoring'

3ee8b3f COMP: Fix Spatial Object Test Segfaults
Fix vtkCommonDataModel and vtkTestingRendering header style

Fix Common/DataModel/vtkAbstractElectronicData.h "not implemented"
comments for copy constructor and assignment operator.  Comment
Testing/Rendering/vtkTestingInteractor.h extra header inclusion.

Change-Id: I92cdcaae470f64f5ca41d722e0ccdb978b704a68
Mark headers to be excluded from header style tests

Add a comment to the bottom of each header that used to be excluded from
kit HeaderTesting tests in monolithic VTK.  Format the comment in a way
that cannot be accidentally copied into another header without
modification.  This comment will tell HeaderTesting.py to exclude a
header from testing so we do not have to separately list every excluded
header in every module.

Change-Id: I9d7ae607125459a6527843c8c15ac463a20f6812
Restore VTK header tests removed by the modularization

Teach vtk_module_library to add a <module>.HeaderTest test.  Teach
HeaderTesting.py to exclude headers containing a special comment like
those added by the parent commit.

Exclude GUISupport/Qt* and Views/Qt because the modules have headers
that are not expected to follow VTK conventions.  Temporarily exclude
the Chemistry/Core module until its headers are fixed or marked as
excluded (they came from the Chemistry kit in monolithic VTK which had
no header test).

Change-Id: Ib6e1313a866db154f7b0e94aa340a10b16f8b9ca
Merge topic 'restore-HeaderTesting' into master

437db4b1 Restore VTK header tests removed by the modularization
002f853f Mark headers to be excluded from header style tests
adb80137 Fix vtkCommonDataModel and vtkTestingRendering header style
vtkCubeAxisActor custom labels.

Allow to explicitely set the labels text along an axis. The label are passed
as an array of strings that will be evenly distributed along the axis.

Change-Id: I3370cf74fb9525ebeb964f254da5a2cbbc0be49b
Prevent infinite loop in case of flat cube axes

Change-Id: Idd0dbb21875eefe71fd75fb1495af89638a68d2c
Merge topic 'improve_quad_view_option_dialog' into master

29434670 Prevent infinite loop in case of flat cube axes
b54530cd vtkCubeAxisActor custom labels.
Revert "Add `syslog_socket` option."

This reverts commit 299e89782fab664e8d85227e9d74500dfe6d61f4.
awe-client pushes back output to shock node
awe-client notifies qmgr work done and the latter moves possible new ready tasks to workunit queue
qmgr locates input data (shock node) for a task based on its predececor's output
add timer goroutine for updating queue; put awe-server url to conf
concurrency control for workunit status feedback
task parallelization: a task can be split into multiple workunits each running on a subset of input data
add config file template and update samplejob.json
rewrite worker function in awe-client
refine some print msg, a version ready for demo and further optimization (0.1)
Merge pull request #3 from wtangiit/master

done awe basic working scenarios
Changed h1->h2 h2->h3 etc
fix type int control line: 108
add fueltools package
add fueltools package
admin panel work 0.1
Dichotomie
Added responsive to offers
Fixing issue #2, enabling HTML5 form fields

Using <?php display_form(id, true); ?> now enables the use of HTML5
forms. This enables several new input types as well as client side input
validation.
Line endings
Update sublime text and conkyrc
Updated to GT.M 6.0.
add node shutdown
Retina-optimized Discover Pixen tutorial (5)
center the teaser
netoyage des console.log et fichier stats créé
set pluginsync to false in puppet client
Revert "format code"

This reverts commit bd9aed5fcfdc302ea19264de6e94ea0e2c593319.

Sorry for that this commit would cause any other local commits conflict.
Really sorry for that. We should figure out the right time to do the
right thing.
added controls for pan & tilt system, moved visualization options to view-options -menu
Remove JASS definition as JASS is a subset of vJASS
Add cohadar for, endfor, while, endwhile
Looks like we're still not that automatic yet. We need to run tests to generate our docs =/ But it's OK now.
Beginning terrain
More work... Not complete yet.
More work on terrain. Getting there.
Merge branch 'develop' into terrain
Fixes, Fixes everywhere
Staging Changes.
Added getTargetCreature, so we can get the target as a creature (if available), this Fixes Issue #406
Merge pull request #408 from Kronos11/develop

Added getTargetCreature, so we can get the target as a creature (if avai...
Fixed height and water checking. Terrain Service is now operational.
Removed lay visitor stuff for now.
Added terrain python bindings.
Readded naboo to default startup.
Removed unnecessary changes.
added attributes map, getter/setter in object
Added some comments.
add files
Merge branch 'develop' into terrain

Conflicts:
	src/swganh/app/swganh_kernel_binding.h
Merge pull request #409 from rcythr/terrain

Terrain
Update src/swganh/tre/visitors/terrain/detail/fractal.h

cleanup pedantic warning.
Update src/swganh/tre/visitors/terrain/detail/layer.h
animated glider, by hackery
increased refresh for testing
Merge branch 'master' of https://github.com/Sergeus/HCR
Added a mercurial diff plugin in order to works with hg repository
Link the create application button on the registration instructions
fixes #5
Cleaning up this script a bit.

Not sure why css3.xhtml-split was being called a second time, didn't
make sense to me.
white i18n links
este.style
+ верстка левая колонка "новости", "новые вакансии"
Fix --it going too far in DynamicTrace

There was a while loop in which --it would go beyond the limit.
Clang figured that out on MAC. Fixed now.

  modified:   pytriqs/Solvers/HybridizationExpansion/C++/DynamicTrace.hpp
build.xml
Main für ANT
DEV-14413
added logic to home viewpoint button to take globe displays back to western hemisphere view
Refactor network code
Add ICMP echo support
Adding Zip-class

Zip reads and extracts Zip files.
Adding IArchive interface
Merge pull request #589 from wbbaddons/zipReader

Adding Zip-class
Adds missing sortableNodeLabel span in categoryList template
Merge pull request #639 from Gravatronics/bug/categoryListSortableNodeLabel

Adds missing sortableNodeLabel span in categoryList template
Improves cache list page
Merge pull request #887 from Gravatronics/enhancement/cacheListPage

Improves cache list page
More template fixes
Merge branch 'master' of github.com:WoltLab/WCF
Changed the bevavhiour of $xajax->configure('deferScriptGeneration',true);
Xajax now hashes all registered responsePlugins and writes the generated JavaScript including the JavaScript core to disk.

This option defaults to true from now on.
Adding thread structure to skeleton
Huoneiden avainvarauksista tieto myös henkilöillä. Tallennetaan henkilöihin käynnistyksen yhteydessä
fixattu gitin ongelmat
disable gentle sleeper and enable arm power
Fix more dependencies
Allow browsers to cache the JSON score data, too
Remove obsolete server_graphs script
more spam
Fix bug in Show instance for SphinxPattern.
Use sort.Ints instead of weird casting.
Add Problem 23. Fix divisors function.
Add Problem 24. Add permutations to util.
A bit of explanation in README
update stub crtwebdriver.js
add unit test for crt controller
Update lib/services/connect.coffee

hide username and password when printing host to logs.
add windsp.c
Converter from Labeled HttpReq + body to Labeled LBson document
Retries for get and set and started better tests

* Refactored out common code for get/set operations into perform
* Started unit tests for client
Better tests and handle timeouts and errors

* Unit tests for get/set/stats
* Added comment for Clietn#perform
* Modified endtoend stats test to be more general
* Timeouts
* Reflect recent changes in README
Merge branch 'fixBuild' into 1.4.x
[maven-release-plugin] prepare release 1.4.8.1
upgrade to sass-3.2.0 (update unit tests)
update unit tests for sass-gems-3.1.19
rename test method
update Sass related tests
fix merge conflicts
Merge branch 'issue454' into 1.4.x
remove unused imports
fix issue463: CSS Image URL rewriting not working for CSS hosted external servers
Merge remote-tracking branch 'origin/issue463' into 1.5.x
fix merge conflicts
Restructured eve-nodejs a little
Readme updated
Update notes for submitted changes

* Fix Cancel button in image add
Update notes for submitted changes

* Fix Cancel in image upload
fix examples not closed
pulling ok_code test from master
porting over from master some better quote handling
change in message
change in canvas app link
Only show mode lock in /cs info if there really is a mode lock
Made db_old load up most of the old mode locks
Minor bugfixes to netdevices, rancid

- Added docstring to trigger.rancid.parse_devices
- Fixed a bug in trigger.netdevices.NetDevice attribute check when populating
  adminStatus that would cause it to always return 'PRODUCTION'
Corrected typo in rancid.rst filename
Lagt till medarbetarkort, plus lite css trollande
NF - wrapper function for multi voxel models
Merge pull request #88 from MrBago/multi_voxel_model

NF - wrapper function for multi voxel models
ENH: Implemented new API for TensorModel and TensorFit

Note that we implement Tensor for backwards compatibility.
RF: Moved ModelArray stuff into Tensor.

This means that going forward TensorModel and TensorFit do not support
indexing.
TST: Testing the new TensorModel/TensorFit API.
Intalize
INSTALL
Merge pull request #12 from dsheets/1.0

INSTALL
Twitter bootstrap and login dialog.
New prompt for Rick Snyder poll.
'string'.is_numeric? helper in ApplicatonHelper.
PollOptionSet and Vote scaffolds. PollOptionSet seed. Poll#vote controller method. recipient_id in Poll. Migrate, yo.
Merge branch 'dev' of github.com:asqus/asqus into dev
Merge branch 'lun1k' of https://github.com/astro/lun1k
Merge branch 'lun1k' of https://github.com/astro/lun1k
animations/tunnel: textured
animations/tunnel_less_ram: texture & shading likewise
animations/tunnel_less_ram: subsampling
cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	animations/tunnel.c
	animations/tunnel_less_ram.c
fixed errors for compilation
Client API.
Fixed workflow.
Updated Game Analysis scripts.
added gitignore in assets and runtime folder
set read timeout
add bumpversion script
bump version mircle 0.0.4
Merge branch 'mircle-0.0.4'
changed background color for empty meme
added views and sort by popularity
merged
Add terminal info
Add highlight for MatchParen for colour wombat
Handle duplicates.
use synth_1, reorder synth_1
add patter_test.js
update role and menu indexno
Signed-off-by: uwebs.cn@gmail.com <uwebs.cn@gmail.com>
Merge branch 'gh-pages' of https://github.com/beango/demo.git into gh-pages
Signed-off-by: uwebs.cn@gmail.com <uwebs.cn@gmail.com>
Formatted shit
Fixed segfault in physical_test.
CIRCLE: correction of a typo.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
CLASS: test if pointer to next class is not NULL.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
SHAPE: correction of a redundant ACAD version parameter.

And some cleanups.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
bugFix ПКО, ако периода няма посочена валута, пдорабзираме BGN
Промени по визуалното показване на cms-а
Merge branch 'master' of github.com:bgerp/bgerp
Abstracted the DB config in config.js, you need to set up your own

Copy config.js.dist to config.js and leave the configuration of your desire in it
stanza_router: Don't bounce type=error stanzas
stanza_router: Also don't bounce <iq type='result'>
完善路由，增加对于http://domain/及目录访问的处理
dev update
dev checkin
dev checkin
Added marking rubric file to assignment 5
add bugid + alternate contact
removed items folder
fix review edit form
Reduce padding for smaller viewpoints
0.9.6 release
Separate out renderer view
Add support for `text/plain` and `application/json`
Remove unnecessary CSRF protection (for now)
Add cross-origin support, although this needs to be more restricted
Require an explicit protocol for the urlizer to match
This does not apply to email addresses
Fix #4
slim:start
Code cleanup
Added samples testMimeTypes and testPlugins
Window object `navigate' method support (Internet Explorer personalities)
Seguridad/Permisos: Archivos faltantes en el commit anterior
Refactor simple.js, didn't work well, maybe this structure works better in bigger games.
implement 'gopm publish'
move package existence check to the server side
print server returned message
adapt the meta.go change
ensure 'gopm create' target file name ends with '.json'
implement 'gopm update'
Show the IM Name when using OnTheSpot mode.
Modified GroupMouseOver
Add Showdown.js
Merge pull request #667 from quaz3l/master

Add showdown.js v0.3.1
Added maintainers key for lodash
Added filename so website can auto-generate link.
Make passing to the event handler fully asynchronous
Fix bug where KeyError would not be handled properly
Including cstdio to avoid compilation error in Debian:

	MnUserTransformation.cpp:30: error: 'sprintf' is not a member of 'std'
message1cd c:/123
Use explicit `block` notation

Blocks should not be passed along to junior mixins automatically.  They should work just like normal in a mixin call's block:

```
mixin bar
  block

mixin foo
  +bar
    block

+foo
  p Hello world!
```
add ; at the end of mixins declaration
link to google group
Merge pull request #614 from chowey/block-fix

Use explicit `block` notation
Revert "add ; at the end of mixins declaration"

This reverts commit 2f34d8613d76703acc2b1adf15213d848f915a7e.
added ;
Merge pull request #616 from pgherveou/master

add ; at the end of mixins declaration
Reworked kill script file perms.
Prevent transaction commit without commencement for 'storage_restore'.
testing a new line ending setting, via @cham
added unit tests for global_tools.c
remove file under tmp
Moved to engine folder
Allow multiple language fields.
发表博客时的修改，代码不超过80个字符
add --version option to bin/sras (closes #22)
update release notes an bump version
Temp: took out sign_in bar.
Fixed: title for homepage.
Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel"
Suggestion to improve (TODO), no actual code changed
Made a more granular configuration possible PREVENT_LENGTHY_EXTRUDE. You can now decide to allow/disallow large length of extrusions to be executed.

Turning off the protection might be beneficial to those who want to do fast and long reversals.
Merge pull request #1 from ErikDeBruijn/Marlin_v1_Ultimaker-rc3

Marlin v1 ultimaker rc3
IE attachEvent bug fix
Add README.md, autoload.php.dist, phpunit.xml.dist
test
commit changes
minor but fixes for bootstrap
Revert "forget the remote address if timeout_if_no_acks expires"
-- one more time

This reverts commit 8c2d71b18e0367dd55ec9544413af5332dfe54ce.
forget the remote address if timeout_if_no_acks expires
heel yah!
Added another paragraph on "why a new language" to the README.
_id field added explicitly as SearchableField

type Check function ignores non-existant _id fields from document, but
makes sure that they are not policy labeled when present
extract successfully converted to a grunt task
removed unneeded bin files
Add some docstrings.
Include js.deform in views.includeme.
Scaling utilities
speed up adding an element to an Index.
improvements to Scaling… not totally sold on it yet
make SentenceTokenizer a case class
PTBTokenizer should recognize some acronyms at end of sentence.
basic URL handling, and @ is no longer a word delimeter
improvements to web-meaningful symbols like @ and :
Fixing sense bugs: remove awareness when creature dies, don't historical false unless level > 0
straightforward. neat trick with dictionary generation to avoid looping
+ ‘application/logs/log-2012-08-23.php’
/ ‘logs/apache_access’
/ ‘logs/apache_errors’
+ ‘application/views/admin/events.php’
os.path.expanduser() on tmp
camera file
-S2 call re-structured
-Coding S3
-Some changes in asm64
tried to de-hardcode field names. huge perf penalties :(
add c2f f2c n2p p2n
Add failing test for util.format
Incremental note consumption.
Use a full, generated MIDI table.
Fixed bug where issues might be counted into different threads by accident
Merge branch 'master' of github.com:eggnet/stca
INLINE each ixEach inline
indexed lens doc cleanup
forced absurd to seq its argument. This turns some infinite loops into <<<loop>>> errors in GHC.
Reimplement glow blur in GLSL (no downsampling yet).
remove unnecessary call to removeScriptElement()
Merge pull request #141 from schraal/ENYO-980

ENYO-980: remove unnecessary call to removeScriptElement()

Reviewed-By: Ben Combee (ben.combee@palm.com)
Simple batch file infection.
Add test templates for untested functions
update input in arraySum
- add additional javadocs
- add new method to bean manager to allow dynamic registration of destruction callbacks on a bean, as well as unit test.
- add additional unit tests for existing bean manager functionality
Export of my eclipse formatting rules, which I believe reflect the Errai project's norms
Fix to ERRAI-317: https://issues.jboss.org/browse/ERRAI-317 "Subscription.remove() is broken (client-side)"
Bugfix: always generate a cast when the "from" type is an unknown wildcard type (such as Constructor.newInstance)
Bugfix: constructor parameter names must be assigned like method parameter names
Bugfix: parameter names were sometimes coming out as Java keywords; now we generate a valid identifier in all cases
Make all MetaConstructor types report themselves as static; also clean up other flags
Implemented ERRAI-234: supporting private constructors in errai marshalling
Implemented ERRAI-233: support for ignoring nested types in marshalling
push unit tests for: ERRAI-318
Merge in latest fixes from 2.0.1 branch

Conflicts:
	errai-bus/src/test/java/org/jboss/errai/bus/client/tests/support/TestRPCService.java
	errai-codegen/src/main/java/org/jboss/errai/codegen/Cast.java
	errai-codegen/src/main/java/org/jboss/errai/codegen/util/PrivateAccessUtil.java
Site updated at 2012-09-21 03:02:40 UTC
basics implemented (getting time from server).
trying iso date.
can now set the JavaScript Date() object from server. still need to be able to add 1s to time every 1000ms.
about 2 seconds off, close enough for government work.
some more clean up.
syncs local and server time (fixes #243).
Merge pull request #257 from eturk/243-time

sync local and server time (within 2 seconds of each other, normally).
at last, 0.3.3.
Finishing up the resume.  Added some automation for future updating of
fields
Finished off the work experience part.  Also made a quick typo fix to
one of the dates
...
Removing all README stubs from the repository
ECMS-4141 allow user to abort one file uploading and all files uploading
ECMS-4016 Add missing unit test for services DocumentTypeService
[aws|storage|test] Replaced random ETag implementation with MD5, per S3 docs.
When Exists boolean is not specified, this request is not idempotent
Scan sort of acts like a GET request, which are idempotent
Merge pull request #771 from lancecarlson/patch-2

Scan sort of acts like a GET request, which are idempotent
Merge pull request #770 from lancecarlson/patch-1

When Exists boolean is not specified, this request is not idempotent
Switch from NewServers to BareMetalCloud for #773

Includes changing from new_servers to bare_metal_cloud as well as newservers to baremetalcloud.
[aws|storage] Added the pagination offset params to the get_object_bucket_versions parser.
Merge branch 'master' of github.com:fog/fog
[aws|storage] Added the MfaDelete value to the get_bucket_versioning parser.
Add deprecation warning
[aws|storage|test] use a random directory key; prevent collision
[aws|storage] Simple multipart uploads; supports files > 5GB

directory.files.create(:key => key, :body => file_handle, :multipart_chunk_size => 5242880)
Whoops, don't need to require digest/md5
Merge pull request #774 from jwang/baremetalcloud

Rename from NewServers to BareMetalCloud
[aws|storage] Automatically abort multipart uploads on exceptions
Merge pull request #766 from estonfer/vmotion

this patch adds host based vmotion to the vsphere provider
Support for rds parameter groups mocking
basic VPC creation
[aws][auto_scaling] Bug fixed: configurations.get(launch-configuration) always shows the first element
it doesn't throw an error when the launch configuration doesnt exist
public module header should not use "<fcitx/>" as prefix
getLocationUpdate

continue,continue~
tfdf vectors
fixed the extract_kbest_wordpairs flag
some stuff
commit test in development
commit-test deleted
First steps with Facebook Connect
Merge branch 'development'
removed pinwatcher.cc
Fix installation migrations.
Update start.php.
Delete old facades.
Delete installer views.
Delete installer files.
Delete custom routing.
Delete custom Application class.
Delete old facades.
Remove old services.
Fix removed controller methods.
Fix namespaces.
No PUT routes for now.
Remove ArrayAccess from base model.
Fix more namespaces in models.
Fix namespaces.
Remove old code.
Medias added and preloaded in xma_application
added sigmoid scaling (not to gradient yet)
added sigmoid scaling to gradient; additional 'cheat' bits; a few other small changes here and there
[brcm47xx]: use memcmp in mem size detection as suggested by blogic


git-svn-id: svn://svn.openwrt.org/openwrt@33619 3c298f89-4303-0410-b956-a3cf2f4a3e73
[brcm47xx]: bcma: do not initialize deactivated PCIe cores

Before it was tried to initialize the deactivated PCIe core in client
mode, but this causes the SoC to hang. Just do not initialize it at all
and ignore the core it is not working and nothing is connected to it
when the specific bit is set in the boardflags.


git-svn-id: svn://svn.openwrt.org/openwrt@33620 3c298f89-4303-0410-b956-a3cf2f4a3e73
Rerun, final edits
Security Update module Email Field
[0.83] HTTP_REFERER checks when behind a proxy fixed #3800


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.83-bugfixes@19014 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.83] fix tree dropdown display of parent, see #4132

git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.83-bugfixes@19878 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.83] Add tag ##ticket.shortentity## to notif see #3424


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.83-bugfixes@18177 35612d4c-9d10-0410-837c-bf9dd1be60d7
fix planning display


git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@17945 35612d4c-9d10-0410-837c-bf9dd1be60d7
everynth versuch, fehlerhafter natur
Undo last commit: cancan is the wrong gem to replace nil_or
Merge pull request #3 from ge0rg/master

Implement XEP-0184 delivery notifications
Add Document->Clone keybinding
Parse scope for D nested template blocks (#3582833)
Fungerande singleton!
Paging for search results
added TUITableViewStyleGrouped

section headers now only stick when using TUITableViewStyleGrouped
Notes added by 'git notes add'
Notes added by 'git notes add'
Notes added by 'git notes copy'
Notes added by 'git notes copy'
Notes added by 'git notes copy'
Notes added by 'git notes copy'
Notes added by 'git notes copy'
Notes added by 'git notes add'
Notes added by 'git notes add'
Notes added by 'git notes add'
Notes added by 'git notes add'
Notes added by 'git notes add'
Notes added by 'git notes add'
Notes added by 'git notes copy'
Started drawing overlays
Long zoom implementation
Merge branch 'master' of github.com:goyman/gmap
Basic tiles drawing working. Using Naive drawInRect approach. Async tiles handling coming next.
update joomshopping
Rename got*o methods
bq: throw exception for missing close parenthesis
Change format of scenarios

 * Define setup/teardown
 * Define requests as separated scenarios (independent from other requests)
Expand a scenario with setup/teardown to scenarios with flat requests
Add literal type values
Update fixtures and tests around batches
Update fixtures and tests around batches
add url authorization file
提交link选中状态，mathjax未加载状态
Merge branch 'MultipleUploader' of https://github.com/guokr/guokr into MultipleUploader

Conflicts:
	example/UEditor.html
	js/lib/UEditor.js
Starting to write doctests for dist.pyx
Working on doctesting.
Merge branch 'master' of https://github.com/haikona/OMS
Merge branch 'master' of https://github.com/haikona/OMS
Fixing a precision problem in stabilize_and_lift.
NTFS: Fix - Tracker faults when 'Show volumes on desktop' mode enabled.
+alpha 4
NTFS: More fixes for #8332
* Generate name for unnamed volumes
+alpha 4
uploading shooter example

html5 game
major improvements- fixed time/date stuff in bolos, improved email with attachment stuff, and more
Colors, indenting, div vimrc
Cache node lookup, see #2201
Implicit conversion from RoleName to Address

* Improved readability in tests if role name can be used
* Will change other tests also if you like it, otherwise revert
Use FailureDetectorPuppet in ClusterSpec
Place the address cache in MultiNodeClusterSpec, see #2201
Merge branch 'master' into wip-2201-cache-node-lookup-patriknw

Conflicts:
	akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
Cleanup based on review comments, see #2201
Remove address vals in tests, fix race in TransitionSpec, see #2201
#2245 - Adding nullchecks in EventStream
Adding IAEs for null subscriber/classifier in ActorClassification
Turning on the ssl test again
Improve phi in AccrualFailureDetector, see #2066

* Implementation of phi according to the paper
* Config properties and documentation, min-std-deviation,
* acceptable-lost-heartbeats
* Restructure code, HeartbeatHistory is responsible for
  stats from historical heartbeats
* Correct and efficient calculation of mean and standard
  deviation
* More tests
Disabling SSL once again
Rewriting large parts of the SSL tests and adding cleanup to the code
Merge conflict resolution
Restructuring some of the SSL code to avoid the risk of races
Making AkkaProvider a Scala Object
Somehow the code for the fast and the secure was flipped
One more barrier in TransitionSpec
Merge branch 'master' into wip-2201-cache-node-lookup-patriknw

Conflicts:
	akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerJoinSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerLeavingSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala
Merge pull request #546 from akka/wip-2201-cache-node-lookup-patriknw

Cache address lookup, see #2201
remove js select label alter
finish ws get class detail
DateField improvements:
- Remove the lat/long to time zone conversion code (requesting user's geolocation too intrusive)
- Allow time zone tracking cookie to be secure
- Add min and max parameters to DateField component
Sanity checking when deleting attachments
added RSFcode
Betrified
committing to pull
Merge branch 'master' of git@github.com:s2012-mcs270-atep/ATEP.git
Commit to update.
Added AssessmentButton to Client Package.  Worked on studentPanel and
ATEP_Web_App and got the buttons working correctly!  ViewButton now goes
to unique assessments, and the return button successfully wipes
everything away so there are never any duplicates.
Merged Helen's persistance version with Nick and Max's working interface
version.  Still getting a "Lost connection to server" message.
Added an AdminPanel that holds the administrator tool buttons.  However,
somehow the format of the panels got thrown off.  Hopefully we can fix.
Adding HttpMachine directly into .sln
* NTCP: Reduce lock contention
 * SSU:
   - Don't relay or introduce to/from privileged ports
   - Various spoof detections
 * Crypto: Rename bouncycastle HMAC libs so they don't conflict
   with older Android versions which bundle them
removed sublime text project file
updates to recent work added anchor links
Fix typo
Use floats for timers
Minor: code style
Cleanup
__repr__
Collection import
Merge branch 'collection_import' of github.com:holadev/iqvoc into holadev-collection_import
Generalized urls in tests' descriptions
Adicionado link para o wiki no README.md
Scrolling horizontal fixed
make web page fetch error non-fatal
redo hybrid/html5app archtype from scratch

these files are copied from template-app, and I'll edit to
include things from the docs and crt post-processing script
app.json
- rename
- add hb template placeholders
- add configs from docs
package.json rname, add {{name}}, etc
routes rename, add mojit route,, {{name}}
rm shell-based template, add hb stuff
rm readme
update controller, binder, model
- use "top_frame" name/prefix
- rename .hb
rename reformat {{name}} + yahoo.mojito.package: public
redo test archetypes again with top_frame, not {{name}}
mv archetype (avoids needing create.js changes)

new: `mojito create app hybrid` command creates a mojito
application and a top_frame HTMLFrameMojit with configs
useful for hybrid Html5App/Cocktails-Runtime development
update `mojito create` usage
- add usage text for `create app hybrid`
- remove remnants of non-functional, long-gone `create project`
de-lint
rm optional config that is part of a separate change
rm old external script
rm dummy binder test
missed one s/_template_/{{name}}/
fix dots in instance name
add .application. to mojit package.json name
rename mu to hb