labofsahil/github-event-dataset-2012 huggingface dataset:
Revert "implement config option for alternative resilence calculation"

This reverts commit 20988eeb4c1151bb18b955bed7f71601259434d5.
Revert "use damageInfo in CalculateSpellDamage() function. by rsa. testing"

This reverts commit 1117e3b9d7148e44439dc5258d22ac92c9e76369.

Conflicts:

	src/bindings/ScriptDev2
Revert "Revert "implement config option for alternative resilence calculation""

This reverts commit a06d03a7564de1c862d87913c143034ec66e024d.

Conflicts:

	src/game/Unit.cpp
Revert "Revert "Revert "implement config option for alternative resilence calculation"""

This reverts commit 2cace0850987dc14e7adf4c61bbfef17d44d253f.
use damageInfo in CalculateSpellDamage() method v2. Testing
More correct targeted movement. @mns
https://github.com/mns/mangosR2/commit/85dab56fc713833962663b1d2513fbb9f59d0341
https://github.com/mns/mangosR2/commit/39e77377eb63a3176cad331248775db9a902c480
https://github.com/mns/mangosR2/commit/047767e4e6e64f7833cf6596b207e65cd5ff7b1d
Merge branch 'master' of github.com:Radicalmangos/Radical
Revert "use damageInfo in CalculateSpellDamage() method v2. Testing"

This reverts commit 121627bfecb83e73dd3759c066433939e2596707.
[mr2006] fix Improved felhunter mana gain spell chain. close #1022.
Merge branch 'master' of github.com:mangosR2/mangos
use damageInfo in CalculateSpellDamage() method v3. Testing by rsa
Revert "use damageInfo in CalculateSpellDamage() method v3. Testing by rsa"

This reverts commit eedef0628784e7052a98016e922765762a66d88f.
[mr2007] move AddPetAura in more correct place
[mr2008] more correct variant of apply part of mr2006
use damageInfo in CalculateSpellDamage() method v4 by rsa
Merge branch 'master' of github.com:mangosR2/mangos
Merge https://github.com/Radicalmangos/Radical
adding rspec dep
Comment edited in main.js, no need to mention the user session anymore
Readme added. Vitae sources renamed.
o Sample code cleanup
o Added a few helper methods to RMFoundation
o Renamed RMTileDump to RMLogTile
o Improved map constraints (moving and zooming, fixes #30)
fixed the focus on chrome issue
Small readme tweaks
Small readme tweaks
Fixed a bug when the option created's label is a number
Fixed a bug where renaming a field wouldn't rename it's label
Add support for relationships field population
Add missing Former::token() method
Change database to postgres
Merge branch 'master' of ssh://git@github.com/AndKiel/Sesje-RPG.git

Conflicts:
	ZTB-dokumentacja/code/create_db.sql
create_db.sql
Changed database to postgreSQL, add database entities
Merge branch 'master' of ssh://git@github.com/AndKiel/Sesje-RPG.git
Added Roles and UsersRoles entities, changed config.groovy, added Spring
Security Core plugin, changed Participants and Users entieties
Added SecurityService
Merge branch 'master' of ssh://git@github.com/AndKiel/Sesje-RPG.git
Działające logowanie wraz z rejestracją użytkowników
Merge branch 'master' of ssh://git@github.com/AndKiel/Sesje-RPG.git
pravki v gemfile
Added README.txt and hook_help
Nouvelle image pour le telechargement sur Google Play
Page de statistiques
Commit en retard : traduction pour la page des apps
Fixed minor issue to get it running
Fixed the Procfile
draw ( )

drawCircle, drawRectangle
Stresstest (fail at 1000 divs)
Fix probleme cursor
Allowed empty file for upload

Fixes bug 1009846.

Upload form in Containers now allows empty files
to be uploaded to Swift.

Change-Id: I4ff4506eae4e9dc0b9d39348cc80780995d1d0ac
A description is not required for a Project creation.

Change-Id: I82e5fad8c514bf3b31c1fb76c05653c9a2917acd
Merge "A description is not required for a Project creation."
registratie email geimplementeerd, errors gefixt
Rebuild Reports 3
NonBasic Types in constants fix
Typo in enhancer corrected.
Update Categories/NSArray+Diff.m

Fixed tabs
Commit con conflicto
Merge pull request #10 from BorjaMartin/feature/ils219-25

Feature/ils219 25
Solve conflict in Main class
Cambio en Main
Cambio en Main
Merge pull request #12 from BorjaMartin/feature/ils219-26

Feature/ils219 26
Merge del conflicto de ramas
removing translation JS after push changes
updating Knockout to 2.2 RC
Supporting multiple votes per race
fixing some issues with new profile system
updating recommendation
method for identifying who has recommended
method for retrieving NOI data
Merge branch 'bus-working'
Additional editing enabled in admin
adjust rake deploy
modify controlblock font size
Search Functions
custom inputs + locales
bins, gens, and apk
Removes subdomain from sql_api_domain config key
Adding map_id to tables
dropdown refactor
make column specs work all together
added user controller to json api
new cdb version
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Fixed text when creates a tabble from scratch + always scroll to the top when paginates, search, tag,...
changed description text there isn't + query mode applied
common styles touched
menu opening by shorcut improved
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Error text changed
fixed showing map not georeferenced when there is actually data
common styles touched
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
share url format fixed
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
fixed updating bubble map
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
http always in share
Records endpoint now returns an empty string when the_geom is empty
Removes ssl requirement on public views
Migration to remove blank tags. Validation to avoid creating new ones
Removing multiple attribute for mobile browsers.
Fixed Android makefile.
hei Alex
Added updated glow shader that should work with low end laptops.
Express structure to get the webapp working aswell

a lot of changes
Bootstraping the site
Delete Old Sqls
A bit of work on #3 and #8

$worked 4h
splitted example wsgi files for vhost/directory
added some comments with deployment instructions
renamed executable
conditional import of ldap module
fixing editor height and adding close button
chaning it to use vars ans constsants
Adding options for storing key and cert files in HTTPS connections for engines
Fixing the get_gdb method for Instance supporting key and cert files
Fixing the arity property in incoming and outgoing relations for schema views and templates
Merge branch 'master' of github.com:CulturePlex/Sylva into devel
Fix warning. Patch by Thomas Zander <thomas@grenfeldts.se>.
getter/setter end
Moved Tonic specific tests out of the way.
Add HelperFunctions unit tests
Add Validators unit tests
Fix not working code and edge cases uncovered by unit tests.
Add Jenkins setup file
Change paths and includes to be more PHPunit friendly.
Add awesome Jenkins Auto-CI and stats generation Ant script

Based on the information on http://jenkins-php.org/.
Moved Database connection to seperate class to facilitate unit tests
Disable database based RecordValidator when running unit tests.
Add missing error messages and codes.
Add Mock objects to unit tests.
Update README.md with unit test dependencies and instructions.
removing special debugging for testing purposes

git-svn-id: svn://oss.dbc.dk/sync_search/opensearch/trunk@40999 51cac136-f83d-432d-bb6f-125e83a60a2d
fixing hasDescriptionFromPublisher


git-svn-id: svn://oss.dbc.dk/sync_search/opensearch/trunk@41003 51cac136-f83d-432d-bb6f-125e83a60a2d
hasDescriptionFromPublisher refreshed

git-svn-id: svn://oss.dbc.dk/sync_search/opensearch/trunk@41005 51cac136-f83d-432d-bb6f-125e83a60a2d
haspublisherdescription added to 150015 and 150028

git-svn-id: svn://oss.dbc.dk/sync_search/opensearch/trunk@41008 51cac136-f83d-432d-bb6f-125e83a60a2d
hasDescriotionFromPublisher added to 150015 and 150028

git-svn-id: svn://oss.dbc.dk/sync_search/opensearch/trunk@41009 51cac136-f83d-432d-bb6f-125e83a60a2d
Fixes to the leaderboards
Corrected the version increment.
Privatize this…
Changes: 
	Plugin Metrics
	Changes to soft mob respawning
	ZoneProperties object to hold properties for zones
	XP is kept after death an none is dropped
	Some refactoring
	Zone names aren't case sensitive anymore, for commands that require them
	Added an optional zone name argument to the "/qplayers" command
Added the optional zone name argument to the "/qplayers" command usage in the plugin.yml.
Base for new Statistics page
Add functionality to Ram Storage
Ram Storage creation
Partial bug fix.
fixed getPos bug
Some changes in font structure and content places
Merge branch 'footer_design' of github.com:Defavlt/plusdagen into footer_design
More style changes - scroller to be added
refactored search functionality
Add dump for 3.3
Fix: Several fix in trigger names
Fix bug on mass mailling unsubsscribe fonctionnality
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
Correct fix
Merge pull request #477 from FHenry/develop

Fix bug on mass mailling unsubsscribe fonctionnality
Fix: compatibility with multicompany sharings
Fix: Sanitize data
Merge pull request #140 from simnandez/develop

Fix: Sanitize data
Fix: Use bad date.
Fix: Autoselect of type.
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/adherents/index.php
fix development bug
Added support Otherpads lol
lint errors
locale override
fixed issues with no OverRide present
; is : in vim
Spellcheck Git commit messages
Better check for MacVim
Added pay() and corrected some other things.
Merge branches 'master', 'master' and 'master' of https://github.com/Eyescale/CMake
Merge branch 'master' of https://github.com/Eyescale/CMake
Add initial shot at a unified CPack configuration
Merge branch 'master' of github.com:Eyescale/CMake
Fixes in unified CPack configuration
Fixes in unified CPack configuration
Tweak unified CPack configuration
Merge branch 'master' of https://github.com/Eyescale/CMake
Use CommonCPack
Ajustar login i estils en el formulari de registre.
Merge branch 'develop' of https://github.com/FATac/fatac.theme into develop
updated CSS
Merge branch 'develop' of https://github.com/FATac/fatac.theme into develop
Moved to production environment ...
Add C version 3
Connected ui with controller - mock
Test Again.
1280x1024に対応可能にした。
Implemented Lua types: ElementDataGrid,ElementDataGridRow,ElementTabSet.

Registered all of the classes with the interpreter.

Added rocket.key_identifier table for Lua.
deleted:    Attacks/BF/bfGen.cpp~
Removing ResizeMonInfo and some jQuery calls

Commented out the ResizeMonsterInfo function until it can be written
more efficiently.

Removal of jQuery calls from:
displayPowerupBox
showMonsterStats
showMonsterEffectsDuration
showSelfEffectsDuration
createDurationBadge
showBattleEndStats
RF used decorator for multivoxex and single voxel case
Error found in visitArrayAccess
* Consolidated passwords to a secrets file.
* Updated data generator.
updated readme
Cleanup Data
Add garmentbox_company_field_create_instance().
Update source code to apply with Apple's LLVM 4.0 compiler
Updated the junit atom test to ensure properties and generic
relationships work.
Merge pull request #70 from EricWittmann/sramp-92-relationships-atom

(sramp-92) Relationships in the atom layer
initial setup for IDE-project feature
skeleton application creation
implemented FlashBuilder 4 task
refactored into separate plugins
Merge branch 'feature-ide-project' into develop
added FlashBuilder config files
added some unit tests
Addition sort almost working
Seemingly works!
changed 'writer' to 'dumper'
construtor Carta(String naipe) definido como deprecated
Initial push: added a gitignore and a composer dependency management file.
inline all calls to Aurinko.fs, avoid using spit in Collection
temporarily stopped reception of step-changed event, which breaks when
view is disposed...  need to fix that, yo
change from list to set for package tracking
add compression of ROS messages
fix bug with Loader
fix compression error
modify compression
Fijando la fecha
Поправил автора алгоритмов на Mikelson.
в схеме просто проименовал вывода для регуляторов.
Only allocate Image rows when they are needed, allow them to be freed when nolonger needed.
Add optional can_free flags to ImageFile writers, Kernel convolvers, and Frame::crop_resize(). This allows them to free Image rows when they're finished with them.
Tell Kernel* convolvers, Frame::crop_resize(), and ImageFile writers when they can free Image rows.
Allow ConditionalStaticAbilities to be keywords.

Just adding the keyword argument to ConditionalStaticAbility, to match
CardStaticAbility.
Merge branch 'MageKing' of git://github.com/Incantus/incantus into MageKing
Moved non-semantic grid classes to it's own file the default grid is now semantic only to use the non-semantic grid classes you should use @import fluidity-non-semantic, this avoids loading the grid functions twice. By making this change the produced css for semantic grids is reduced by about 1000 lines that's an easy decision to make.
add temp.txt to the project, this is a experiment
experimental branch
Updated Makefile to create a tar archive.
Make zone listing show all hosts in zone in non-json output
jjroma v3, implementing the ascii printing as well as placing cards from hand to board
Completed exercise 6 of chapter 7. Could be improved.
add underscore extensions in root
passing classes to another project
Updated htdocs/prefs.html AutoGoTo entry

AutoGoTo effects hotkeys and the docs should reflect this
Merge pull request #70 from JoesCat/8acfe962cc1d7ac8d49865285df9b196603edbac

modified utype2[] to be corrected to use a fixed-size uint32 instead of unsigned int
Merge pull request #63 from JoesCat/master

codepointassigned[] converted from unsigned int to uint32
fixed a mem leak
Updated TradeService's SecureTrade ObjController handler.
Updated TradeSession to remove unnecessary trade_request_accepted flag.
a:hover no underlines
added touch-icon without size to use in add2home
Configs optimized for VM.
Add scripts to install eclipse and/or netbeans after the installation is finished.
Walls and score are now shown

The board is now lined with walls. The aim arrow has a new texture and the
placement of shot and next shot are updated.

The panel now has its own background and there is also a chalk board
texture for the score board where the current score is shown. Points are
given for shooting balls and slightly more for dangling balls.
Update template to Platform2
Add a color mask
change test
Finish layout and routes
Fix warning in KunenaView::loadTemplateFile() on Windows
Merge pull request #875 from mahagr/master

Fix warning in KunenaView::loadTemplateFile() on Windows
Improvements for AUP 1.6+ integration 
Merge pull request #882 from xillibit/bugs6

Improvements for AUP 1.6+ integration
Fix #1116: Login fails with special characters like < or >
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Fix warning resulted from #1098
Merge remote branch 'upstream/master'
Improve CommunityBuilder detection in #1084
Merge remote branch 'upstream/master'
Fix bugs in fix for #867
Merge pull request #1117 from mahagr/master

Fixes for #1116, #1098, #1084, #867
Attempt to translate
~/.xmonad/xmonad.hs
add settiings for xmobar and floating windows.
vimperator files.
~/.vimrc
add settings and plugin for haskell
Moving compression into different file for portability
a proper about() message
can send list of commands
new tests
use cmake to compile the qt client with the  option : -D ClientQT=1
don't need anymore of the .pro file for compiling the client
make the protocol lighter
test respectfull to the protocol
add the converter from C to Qt for the json parser
use yajl instead of qjson
put a QSslSocket instead of a tcp socket
Merge branch 'features/client' into dev

Conflicts:
	CMakeLists.txt
Help Module Created
Help Module Forms
Header center buttons, alerts and messages
zsh aliases and config
BugzID 1665 - Add leftJoin and rightJoin convenience methods to the gacela query builder
Small fixes.
Implemented \L\FormSelect for form().
Modification du timeout MySQL à 36H, vu que la connexion est unique si
le plugin ne fait aucune requête pendant 8H MySQL ferme.
Alternatives > autoreconnect ou forcer un ping à chaque query (O_O).
Added Web Manager

- Added a Web Manager to handle web interaction
- Updated to the new bukkit release
Force tests Charset to Windows-1252
"Windows-1252
Merge branch 'master' of https://github.com/Maetis/tfs-plugin
experimenting with concrete plates

pretty useless at the moment, removed by default
[WebSite] icon updated
[WebSite][CV] Browsers test
[WebSite] Browser compatibility fix
Starting work on MineMon3
+ addded the crpoj files for v4.0
+ missing package descriptors
+ changed the output path of all the projects to bin\ so nuget can find the packages easier
+ nuget specs
+ pacakge build script
+ changed the output directory back to bin\Debug or bin\Release depending on build config
+ changed the package specifications to use the new bin\Release path
+ removed the hardcoded path to msbuild from the package script
[vim keymap] Fix A and added test to prevent future regression.
[vim keymap] More unit tests and fixes. Most keys covered now.
Support blank lines in CodeMirror.multiplexingMode

This adds a blankLine method that calls the current mode's blankLine if
it has one. It has allows switching on a blank line if "\n" is specified
for "open" or "close".
Add HaxPad to real-world uses
Fix D,C,Y off-by-one error.
ignore *.orig files from merge conflict resolution
Use an empty string instead of null for document.implementation.createHTMLDocument, should fix Opera compatibility.
Add the context post from which a clone comes from.
Remove previous quote preview when quote previewing in case it gets stuck by a low quality browser. Fix #494.
After win32-kill branch merge:
- don't import rwin32 on posix platforms
- simplify TerminateProcess error handling
タイトル画面をマウスで操作できるようにする
イベントキューの遅延防止
ルール設定画面をマウスホイールで操作できるようにする
マウスホイール操作時のページめくり
fixed a reverse reference problem in populate.
- made BuyCraftStack useable for Maps
- added template for second part of Task 2.
- updated task for the second part of Task 2.
- source code for second part of Task 2 extended;
- realized function for adding words to array.
- finished solution of second part;
- added comments to the code.
I can create Sprites and soon everything else
Added JDoc to Reservation Setters/Getters
Merge branch 'domain' of github.com:Nagian/Roomanizer into domain
deki commit pertamakali
remove excess list copy
работающий прототип, траблы с памятью (походу не чистится rset), пропускает некоторые пустые тайлы
modify readme
Merge pull request #2 from node-pomelo/master

format readme
list presenter
Move stuff around to siplify error handling
Tighten a few error paths to avoid fd leaks & stray tempfiles...
Update EmbPT/models/model.dae

A simple quad in collada format for the radiance and embree comparison
Attempt at cleaning up SpoutEntity (making more things
atomic...restructuring...remove read/write locks) as well as adding
configurable viewdistance to SpoutConfiguration (can still be manually set
if needed and should be for anything but observers).

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Change camera movement.
Add variable height to countries.
Refactor camera code for different movement.
Add normal data to vertices.
Add lighting.
Better parsing of full season releases on disk
Test buttons for XBMC

New: Added buttons to test XBMC configuration
Test buttons for Plex

New: Added buttons to test Plex configuration
Merge pull request #55 from Oblosys/master

two typos
Tooltips height depends on the height of the content.
Removed debug stats
Added some notes and comments
Merge remote-tracking branch 'origin/info-tooltips'
Tanda de arreglos

- Arreglo de "Combustión" (Mago fuego)
- Arreglo de "Oleada de lava" (Chamán elemental)
- Arreglo de "Tren de pensamiento" (Sacerdote disciplina)
- Arreglo de "Penitencia" (Sacerdote disciplina)
- Arreglo de "Fuerza del alma" (Sacerdote disciplina)
- Arreglo de "Reposición" (Paladín)
- Arreglo de "Sentencias del audaz" (Paladín)
- Arreglo de "Inmediatez" (Cazador puntería)
- Arreglo de "Pecado y castigo" (Sacerdote sombras)
- Arreglo de "Velocidad de luz" (Paladín sagrado)
- Arreglo de "Anillo de escarcha" (Mago escarcha)
- Arreglo de "Sed de sangre" (Guerrero furia)
- Arreglo de "Voluntad de la necrópolis" (Caballero de la muerte)
- Arreglo de "Tótem Garra de piedra" (Chamán)
- Arreglo de "Escarcha temprana" (Mago escarcha)
- Arreglo de "Vórtice abisal" (Mago arcano)
- Arreglo de "Potenciación rúnica" (Caballero de la muerte)
- Arreglo de "Aspecto salvaje" (Cazador)
- Arreglo de "Protección contra las sombras (RAID)" (Sacerdote)
- Arreglo de "Marca de lo salvaje (RAID)"  (Druida)
- Arreglo de "Bendición de reyes (RAID)" (Paladín)
- Arreglo de "Palabra de poder: Barrera" (Sacerdote)
- Arreglo de "Instintos de supervivencia" (Druida feral)
- Arreglo de "Escudo sacro" (Paladín)
- Arreglo de "Zona antimagia" (Caballero de la muerte)
- Arreglo de "Fuego feérico" (Druida)
- Arreglo de "Agresión feral" (Druida feral)
- Arreglo de "Golpe letal" (Caballero de la muerte)
- Arreglo de "Escudo de sangre" (Caballero de la muerte)
- Arreglo de "Acortar" (Pícaro asesinato)
- Arreglo de "Matar" (Cazador)
- Arreglo de "Mareas vivas" (Chamán restauración)
- Arreglo de "Choque estático" (Chamán mejora)
- Arreglo de "Terremoto" (Chamán elemental)
- Arreglo de "Galopada salvaje" (Huargen)
- Arreglo de varios crashes
- Arreglados dos fallos de compilación
- Reestructurados los hechizos del chamán

Autor: Darkpeninsula
Refactored custom editors & formatters into separate files.
Fixed issue #1071 thanks to the patch by Tomas

git-svn-id: http://orient.googlecode.com/svn/trunk@6659 3625ad7b-9c83-922f-a72b-73d79161f2ea
Dodanie brakującego pliku
Clientside templating intitiated
Display modification final already
Рабочая схема Жордана + тестовый пример
Update 3/0000/0001.txt

I finished translating the english lines to Malay.
No progress on japanese lines
fixed ie plugin throwing exception when setting unknown CSS values
added another in-the-wild link
lets call this a release (0.5.0)
theres no skrollr.css anymore
removed the plugin api in favour of sth simpler
removed the plugin api in favour of sth simpler
use extended info rather than description to house the undo hash
Add shortcut to 'Clear private data' menu action as per #486
Reports business
Merge branch 'master' of https://github.com/RCJurriaans/CV_OR

Conflicts:
	Assignment2/harris.m
bypass old curves
Just adding the first files
deuximeme
Job offers index updated
PBL 1.0 license text added to each source file
PBL 1.0 license document added
added passenger_apache2
Hello World

This is my first application
http://dev.rosyama.ru/bugs/show_bug.cgi?id=153
Moved generated `vars` out of functions into config
splash page in progrss. index images directory added with images for use in splash page.
trying gemfile.lock problem
Splash images and text update
splash page basically ready, up for critics
Gemfile.lock deleted
updated index page
Merge branch 'dev' of https://github.com/SE-Team/project-x into bianca
merge bianca and patrick
Numerous bug fixes and refactoring.

From: http://code.google.com/p/sqldroid/issues/list
resolves issues 3-10
Rename sqldroid -> SQLDroid
Merge with refactored code from com/lemadi/storage/database/sqldroid to
com/sqldroid
Call API 11 specific code by reflection only.
Added "toString"
Removed unused "ContentValues" and System.out's.  Corrected "setBlob"
"position" parameter.
isFirst,isLast,isBeforeFirst,isAfterLast now all return false if the
resultset is closed.
Comptibility code. Miscellaneous Blob changes.  Small unit test and
Connection changes.
Added support for Properties when the connection is created.
Updated to match behavior described in JavaDocs
Removed useless code.
Statement.execute() test
Added constructor
bind null in case of java null parameter
Changes to SQL execution so that the behavior matches the documentation
for Statement.  Including a valid return for an update and insert.
Changes merged from https://github.com/bagges/SQLDroid.git
Bumped version to 1.0
Merge remote-tracking branch 'ergouser/master'

Conflicts:
	src/org/sqldroid/SQLDroidConnection.java
	src/org/sqldroid/SQLDroidDatabaseMetaData.java
	src/org/sqldroid/SQLDroidDriver.java
	src/org/sqldroid/SQLDroidPreparedStatement.java
	src/org/sqldroid/SQLDroidResultSet.java
	src/org/sqldroid/SQLDroidResultSetMetaData.java
	src/org/sqldroid/SQLDroidStatement.java
	src/org/sqldroid/SQLiteDatabase.java
Fixed #580: Add possibility to hook into actions
gtignore

gtignore
emacs: fix key binding
update for beta3
Merge branch 'branch-6-2'
update for beta3
Merge branch 'branch-6-2'

Conflicts:
	mapserver.h
implementation of POLYLINE_NO_CLIP
merge branch b4444: polyline_no_clip implementation
simpler POLYLINE_NO_CLIP (#4444)
Fix drawing legend icons for annotation layers when no marker symbol is given (#2917)
Fix OGR autostyle label rendering (#4449)
Merge branch 'branch-6-2' of https://github.com/mapserver/mapserver into branch-6-2
Fix MSSQL to parse 3D geometries (#4450)
avoid integer roundings in clipping buffer calculation (#179, #4451)

closes #4451
Fix multiple classes in a inline layer
Merge branch 'master' of github.com:mapserver/mapserver
add SCALE support for cascaded getlegendgraphic (#4452)

closes #4452
Merge branch 'branch-6-2'
scale dependant resolution fixes  (#4401)

- scale label minsize/maxsize by resolution factor
- scale line widths and symbol sizes by resolution factor
Resolving compiler warning.
Merge branch 'branch-6-2'
Add all the octocat txt files
Initial commit
Init g-Toolbox
Merge branch 'master' of https://github.com/Scoms/G-ToolBox
Remove all the cats
commit algo
Algo de warshall
MAJ Julien DFS
MAJ Julien DFS plusieur sommets possible
Floyd-Warshall
Init
added pagination
merge from master
seizam_logo_square.png now hidden at the bottom of the body.
LocalSettings: $wgLogo = seizam_logo_square.png
Testing to commit
Merge branch 'master' of https://github.com/Sgluive/PokeTower
seems like it did an auto optimize imports on commit...
seems like it did an auto optimize imports on commit...
Merge remote-tracking branch 'origin/rc-dev' into rc-dev

Conflicts:
	circuits/src/main/java/com/sk89q/craftbook/gates/world/WaterSensor.java
Merge branch 'rc-dev' of github.com:Silthus/craftbook
i hate merging -.-
Added code links to docs
Add the order number
fixing hosts stuff
Merge branch 'master' of github.com:SlexAxton/rhokgho
SONAR-3529 Display properties in same order as annotation
SONAR-3579 New way to fix conflict with local ruby installations
SONAR-3633 improve the management of server-side settings

* do not save default resource permissions in a db migration but in a server-side extension

* new component to save settings from server-side components. It will have to be used by ruby app later.
Fix Sonar Core Plugin unit tests
Abstracted connecting to an URL
Restore getPlayer, matchPlayer, getAllPlayers to Engine.

Signed-off-by: Chris Sanders <zidane@outlook.com>
Improved bundle logic and added inventory viewers

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Merge pull request #258 from bergerkiller/master

Improved bundle inventory storage and added new Inventory Viewers
Two key events are redundant.

- Merged KeyEvent into PlayerKeyEvent.
- Formatting.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Respawn update
- resets chunk lists
- TODO - entity lists need to be wiped too
Better resource loader now accepts multiple extensions

Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
Merge pull request #321 from simplyianm/betterresourceloader

Changed ResouceLoader to accept certain extensions.
Configuration improvements and bug fixes - ConfigurationNodes will save to disk now
Signed-off-by: Windwaker <wjcrouse913@aim.com>
Merge pull request #139 from W1ndwaker/config

Configuration improvements and bug fixes - ConfigurationNodes will save to disk now
Really fixed that silly bug now. Promise.
Merge branch 'master' of github.com:SteamDRM/SteamDRM
Latest hosts file
Latest MVPs hosts file
Latest merged hosts file.
Alien Item levels
aliens will now properly progress through a table of weapon set
probabilities as defined in the ruleset.

also added a button on the new battle menu to manually select alien loadout

introduced a new variable in save game data "monthsPassed" because it's
easier to keep track of this than to calculate on the fly with date-based
math.

this will break your saved games. deal with it.
Alien Aggression progression

after 5 months, aliens will double their efforts against the earth.
after 10-14 months (based on difficulty) or if the player has researched
the martian solution, aliens will generate extra retaliation missions
against xcom bases.
Updated Changelog.
fix for game crash on base defense loss

whoops, forgot to clean up the base when i erased it.
recalculate LOS on unit death.

units visible to dead units would stay visible. lol.
safety for random point generation.

make sure the values are set properly,
even if they're set wrong in the ruleset.

TODO: make this a function of LOAD()?
fix for bad units with empty item sets

just because they're empty, doesn't mean they don't need 3 of them.
fix for retaliatory ufo spawning.

we should probably check the base's "detected" status when we're
looking for a detected base
Add right click to delete

allow for right mouse button press on textlists.
use that new functionality to add the ability to delete saves from
within game, but make sure to pop up a confirmation window first.
while we're at it, let's add a string so that people will know about
this new functionality.
Convert Base Vehicles

not 100% sure this works as it should, but it should work.
i hate large units

they cause nothing but problems.
fix for faulty game over condition.
delete crafts properly
safety for base destruction
fix for dogfight range

missiles would travel beyond their range if fired while the ufo was
outrunning the interceptor.
now missiles will be properly destroyed at the end of their range.

this also fixes the bug associated with it where the "new destination"
windows would pop up under those circumstances.
better fix for visibility

only BIG explosions should check discovery rather than visibility.
Alien Pact Signing

completed alien infiltration missions will generate pacts as they should.
Updated Changelog and project files.
Merge branch 'FinishingTouches'
PrimaryController:
 * Fixed parsing of the rudder status CAN messages.
Upated format
Fixed formatting
use viewport
Make ValidateAddress return an explicit boolean as docs say it does
Reformat regex slightly, seemed to produce odd effects with literal tab chars in: This fixes #10
Add email validation test cases
Reformulate translation test case so all problems are reported together
Forgot to add file that I renamed.
extracted redis record into seperate gem
added github tutorial
Update CXF version to 2.7.0
Update SLAuthenticationProvider
Fixed object rotation
fork Email and Exchange

Change-Id: Iec59ddf423ac34607ca418ff5c1744df3ab43df9
Update .gitignore

...
Deleted reference to X86Gen shouldn't really change anything
Implement todo list into repo.
Avoid initialization problems
Enhance CSS for readability
And also forgot to include the new files. Here they are.
Database updated with key
Generate missing aspects.
-Fix: MCForge implemented WorldGenMinable slightly different
second
Merge branch 'master' of https://github.com/Tshooter/HelloGit.git

Conflicts:
	gtest/src/ch/Test.java
added videos to Swell eats html
Added script to remove empty p tags
Minor header/footer stretch fixes for 768-979px sizes
initial big-picture responsiveness for tablet to desktop sizes
Added responsive styles for tablet to mobile sizes
Adding the zencoding plugin for vim
Add fail keys and messages functional
some small code changes in Playlist/CPlaylist.cs, no new functions
Break up /etc/default/tvheadend to make it easier for users to set relevant settings. Init scripts then handle the config to set appropriate command line switches.
Ensure that multibyte chars are properly converted for ISO 6937.
Fixed ISO6937 0xC7 code table, also updated the formatting to make it clearer.
Testing fixes
a update

a update
- added cache for Twig!
去除调试代码；完善新建目录api，基本测试通过
Started porting WordPress
Working on WordPress
Working on WordPress: all generic script methods are implemented.
Fixed NPE in WordPress.setUserGroups() (WordPress-specific util method)
Forgot to implement getUserCount()
Added confidence for LexiconChecker
Import Duties + VAT update
.htaccess: use 1 week for js and css
Fixed import dialog.

Import other file than *.ubz is available too.
InputEdit added and tested, TextEdit removed, DateView added and tested, various fixes
Minor fixes, project cleanup
mfp-qa test project v2.0 was added.
theming

configs on site tpls and page tpls
some theming-task
added frame work
	-960gs
	-normalize
Lots of polish.
Fixes #12
References #10 - Top speed is stored, but not shown anywhere.
Fixes #9
References #8 - Pause button works as expected, but Stop button still disabled.
Screenshots for app submission
Fixes #12

Fixes #9
Fixes #8
References #10 - Top Speed is stored, but not displayed yet.
Create runner for webstorm test running
Added single image plugin. Needs a better interface than a dropdown of PKs
add ooo
lalalala
add lala
upgrades to rails 3.2.9
intro_scene01_def
Enable the PodnapisiWeb service.
initial look at adding controls
correcting the value lenght and flags
fix the bug in InteractiveGameHandler.java (Bug: cannot update the adapter due to using another thread)
Just throwing some testing back and forth between my laptop and the OPI.
aideco
delete some obsoleted files.
Added term title + git

+ Added term title setting in zsh
+ Added git view in prompt
Updated create, added destroy, added transaction wrapper
Before delete from fourpounds
do not call setDataSource() if we are going to destroy the object anyway
Remove volume override feature
This seems to be pretty buggy for some reason (android bug?) and crashes with random errors - even on freshly initialized MediaPlayers
target-sh4: QOM'ify CPU

Embed CPUSH4State as first member of SuperHCPU.

Let CPUClass::reset() call cpu_state_reset() for now.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: QOM'ify CPU reset

Move code from cpu_state_reset() to QOM superh_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Start QOM'ifying CPU init

Move code from cpu_sh4_init() into a QOM initfn.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Do not reset CPU feature flags on reset

Move them out of CPUSH4State so that they are not zero'ed on reset.

Signed-off-by: Andreas Färber <afaerber@suse.de>
hw/sh7750: Use SuperHCPU

In place of CPUSH4State use SuperHCPU for SH7750State::cpu field.

Fix tab indentation on those lines and add braces.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make cpu_sh4_invalidate_tlb() take SuperHCPU

Change argument type from CPUSH4State to SuperHCPU.
This simplifies the SH7750 SoC as its only caller.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make increment_urc() take SuperHCPU

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make find_*tlb_entry() take SuperHCPU

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make cpu_sh4_{read,write}_mmaped_{i,u}tlb_addr() take CPU

Change argument type to SuperHCPU and update the SH7750 SoC.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make get_{physical,mmu}_address() take SuperHCPU

Simplifies TLB helper code.

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make copy_utlb_entry_itlb() take SuperHCPU

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make update_itlb_use() take SuperHCPU

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-sh4: Make itlb_replacement() use SuperHCPU

Signed-off-by: Andreas Färber <afaerber@suse.de>
Included load_devices function
reordered tcpdump in screen default windows
update sample for Nokia5110
restore project files and setting
Correct CPU clock frequency definition in makefile
Update to MIT license to reflect new ownership.
Migrate build file from ant to phing and fix the build process
Sockets working ... client sends his PID to the server
Merge branch 'master' of github.com:akarpovsky/SOTPE1
10円だったらtrueというケース追加
ship animations
Insurance rule select country corrected
simplified test case to embrace new syntax
Add coverage in index.html
added more snippets and css.snippets
Avoid new user double click
Fuege get Methoden hinzu.
Added test for logging in
Removes an unwanted console.log and changes some double quotes for consistency
Reverted to 3.3.2 (last version before Motorola removed features including inline signatures and barcodes).
Fix for border bottoms on category list items on homepage
Merge remote-tracking branch 'origin/browser_testing_3'
New tour content
New tour content and image placeholders
Updated links and left a comment in the code for Dai's video
Update title attr of tour
Add an area for the transcript to go
Removing images as we won't have good enough ones made in time. To be revisited post Oct 17
Copy changes.
Further copy change - car tax search changed to driving test
Added video poster frame image
Fix for number of columns displayed on category pages. Ticket #5021
Added transcript text
Added updated caption with credit
Updated title text
Update media player configuration

This affects all videos on the site that use the player. Small changes
but will make the player useful in more places on GOV.UK
Add markup for video player using temporary video

Video to be replaced before going live
Add correct name attrs to search boxes
Update video URL
Added last classes for old browsers

Last item in rows of 3 currently targeted by nth-child which is not
supported by IE<9 so needs a class.

Note: all classes tied to this class are only served to those browsers.
Merge branch 'master' of github.com:alphagov/frontend into browser_testing_4
Bump Gem
Another pointless change to trigger preview refresh
Enable logging options and sync log when in dev.
Add logging of deletes to Sinatra log.
Made attachment mediumblob 16M for data col
ubuntu user for rc.local
WIP nodes~
; 忘れ
- BaseX\Query\SimpleXMLResult::getData() now returns xmlstring without header
- Fix error class in BaseX\Session\SessionInfo
Use rdoc markup in code
Merge pull request #325 from frodsan/patch-1

Use rdoc markup in code
added twitter bootstrap and borrowed some code from battleship for game joining logic
Removed duplication
Removed duplication IChangeListener
Removed ListenerList
Message is  anathema package
CentralExceptionHandling in  anathema package
Dialog in  anathema package
disy commons gui classes integrated in lib package hierarchy
ensure replaced by Precondition
The web view handle is now sent from the hybrid moblet to javascript. We can now create a screen structure (in javascript) and add the webview to it, together with other native widgets (the same webview that loaded the page adds itself to the new screen structure)
MOSYNC-2566: Fixed template parsing; negation and special android context
[MOSYNC-2511] Examples: Added PhotoGallery to examples.list
Merge remote-tracking branch 'origin/master'
[MOSYNC-2534] Wormhole: Merged updates for improved handling on NativeUI in JavaScript apps.
[MOSYNC-2540] Templates: Removed outdated comments.
Merge pull request #255 from andersmalm/master

Additions going back a couple of months :)
Merge pull request #260 from divineprog/master

[MOSYNC-2511] Examples: Added PhotoGallery to examples.list
Merge pull request #261 from mattiasbybro/master

Important template bug fix
MOSYNC-2361: fixed - the problem was that in a previous fix, on a 'maWidgetDestroy' call I removed the destroyed item - this reordered all the widget list and created problems. The deleted widget is now only set to null
Merge pull request #234 from andersmalm/master

Merged ThreeOneOne with master
Merge pull request #233 from spiridon-alexandru/ThreeOneOne

MOSYNC-2361: fixed
[MOSYNC-2367] tools/package: Fixed bug in Android manifest generation causing an app to start multiple instances in some cases.
Merge branch 'ThreeOneOneRestart'
Merge remote-tracking branch 'origin/master'
Common ground fix between MOSYNC-2371 (bluetooth crash on Symbian) and MOSYNC-2344 (downloader crash on ios)
Merge pull request #237 from iraklisrossis/ThreeOneOne

Common ground fix between MOSYNC-2371 (bluetooth crash on Symbian) and M...
Merge pull request #236 from divineprog/master

[MOSYNC-2367] tools/package: Fixed bug in Android manifest generation causing an app to start multiple instances ...
Merge remote-tracking branch 'upstream/master' into CameraPreview
Merge remote-tracking branch 'upstream/ThreeOneOne' into CameraPreview
новая ветвь
update map call
update styles etc
Merge changes to ccgui.py

Add title to general settings page.
Add option to specify temperature units to general settings.
Comment out code to prevent resizing for now - used to test multiline labels.
Remove some white space.
Remove debug message and unused code from prepare_action.
Add temperature units to generated commandline.
Add space to make commandline debug message to make it clearer.
Merge LOTS of changes to default.py

Change "System" to "System Information"
Move battery options to their own section.  Needs a bit of explaining for --battery-value so should make it clearer in the long run.
Add option to specify --battery-value.
Make CPU count, number of processes and battery value disabled by default.
Add logic to enable above mentioned controls if their associated check box is enabled.

Relabel desktop page title to "Appearance" ready for alignment controls.
Uncomment support for --kde now it is included upstream.
Add logic to "Date" screen to disable all controls if nodata is enabled.
Add information about running ct to get help on adding tasks.

Move MPD support so it MediaPage flows more like conky-colors -h.
Add beginning of support for HDD usage and temperature monitoring.

Remove GMail Page to NetworkPage.
Add beginning of support for network monitoring, including ability to specify network adaptors.
Make GMail controls class members so they can be accessed.

Replace weather checkbox with a combobox.
Allow the user to specify which weather server to use.

Update last page information.
Adding changed .tmux.conf
Updating README a little bit.
Starter code for a request feeder

The current code takes in the commandline input
and tries to open a socket to feed the requests into.
Feeding request to proxy
Merge branch 'master' of github.com:yapkke/webPriority
angular refactors
Mostly done multiple generators
Proposal: function mkdirTree to build directories from Tree FilePath
init backbone
start projects with backbone
show project
show project by direct link
fetch single project
Implemented RESTful storage-side storage.
added http://morphia.googlecode.com/svn/mavenrepo to repositories
migrated RecommendationFacade
merged pom.xml
More work on APSTUD-4221 Externalize UI strings in HTML ruble
Merge branch 'development' into release

Conflicts:
	cache.yml
added special behaviour of TinkerKit.h when included after Esplora.h

(that was formerly done in Esplora branch "tinkerkit")
added joystick object
- Move handling of gold to JavaScript.
- Move take(), kill(), die() methods to JavaScript.
Add Area game object and event.
Added Users, Category, Product to migrations
experiments/show Added axis labels to main graph.
normalizing field names according to solr schema.xml reference
JBPAPP-8726 Fix NPE that results when the remote view is not inferred from the home view of a EJB2.x bean configure via deployment descriptor
JBPAPP-8726 Add a test which uses ejb-jar.xml to declare home interface but doesn't declare a remote interface
[AS7-4467] Use correct pool definition
AS7-4426: Export HotRod Client module to fix RemoteCacheStore
Increase the testsuite process timeout :(
AS7-4612 Race condition between stopping of web session cache and cache container
Use synchronous stop().  Fixes redeployment errors due to asynchronous stop/start cycle.
WS-Security tests - portName/serviceName changes to avoid client side caching, tests for EJB endpoints, done as part of JBQA-5249 task
AS7-4633 Concurrent Access to @SessionScoped @Stateful beans is not serialised if there is no active transaction
AS7-4633 Make the SFSB cache use a reference counting mechanism
JBQA-6055, JBQA-6174 Added ClassloaderLeakWarTestCase, ClassloaderLeakEarTestCase,
ClassloaderLeakDistributedAppsTestCase.
Added ClassloaderLeakWarTestCase.
Added ClassloaderLeakEarTestCase.

Added clustered leak test.

Added memoryFill for more aggresive gc.

Finished ClassloaderLeakDistributedAppsTestCase.
Rebased.

Classloading leak tests moved from integration/basic to
integration/manualmode module to run in isolated environment.

Deleted.

Rebased.
AS7-4185 Disable intermittently failing test
[AS7-4468] Put affected servers in reload-required state following socket-binding-group removal,

and make the server socket-binding-group add only perform the installation of the service if
booting. Otherwise put it in reload-required.
AS7-4468 Revert reload-required on rollback; do remove reloadRequired call in runtime
AS7-4664: upgrade PicketLink to v2.1.0.Final
[AS7-4589] Upgrade to JBoss SASL 1.0.1.Final
Add proper SFSB removal checking for Weld
Weld 1.1.8.Final
AS7-4669 Upgrade PicketBox to version 4.0.9.Final
Allow users to manage drawings' surveyor
live changes to the guide and tester source code
Properly handle repeating headers (e.g. set-cookie) by storing and reading
multiple entries.
Version 1.5.0
Update interfaces/web/wui/README.rst
Modified Blog Layout
[Finishes #27342337] the 80-chars-wide index page -- links to Unlicense.html copy, mentions Emscripten possibility
learning tutorials
#10 change Link
not use module 'log center.client'

create logcontainer module.
uploading application artefacts - scripts - javascript component libraries
virt: Add one method in get_node_cpus to check cpus for Numa node

In some old version of numactl(0.9.8), the output of the command
"numactl --hardware" will not include the cpus info. So add one
method to get cpus from sysfs when the numactl failed to get it.

canges from v1:
  - try/except add to catch the exceptions
  - comments add and variable name update

Signed-off-by: Yiqiao Pu <ypu@redhat.com>
fix server saving
Move toward first-class Double support.

Previously, many of our lazy/tiled raster data objects would not properly
handle double values, and would instead use the underlying int-based
implementations. This commit fixes the most obvious problems.

There is still a lot to do including:

  1. Implement new Lazy* classes to wrap mapDouble et al
  2. Update operations to detect and support both Int and Double
  3. Try to reduce the somewhat ad-hoc overriding going on
Move fold/foldDouble into RasterData.
Remove "stub" convert method from RasterData.
Port LazyWrapper to a mixin called Wrapper
Improve double overrides and conversions.
Clean up unnecessary "override" keywords.
Finish int/double conversions clean-up.
Rename combine2 to combine.
Update most math operations to support Double.

This change adds a collection of "dual" methods to Raster, like dualMap. These
methods receive two functions (one dealing with Int and one with Double) and
will perform the most appropriate of the two given the raster type.

Using these methods, we can update most of our math operations to support
Doubles as well as Ints; in some cases (i.e. Bitwise operations) there is no
appropriate Double-based implementation.

There is still more work to do in terms of unifying various operations (i.e.
AddConstant and AddDoubleConstant) as well as fleshing out "missing" operations
and adding more testing. Also, laziness is still not totally "Double-compatible"
Merge pull request #140 from non/topic/double-data-fixes

Topic/double data fixes
Fix for a bug when trying to load a Song that's right inside Content's folder.

If you put a Song (wmb + xnb) inside the Content's folder, the CurrentAssetDirectory is used with the ContentManager.RootDirectory at SongReader's Read method, merging them and causing it to use the wrong path. I've tested this only on Windows8, so probably need to test this on other platforms too to make sure this is not a Windows8 bug only.
Data size should be integer
获取远程请求地址（忽略代理）
change version and description
Testing commit through eGit
Updated rigging version dependency.
Bumped version to 12.11.1700.