labofsahil/github-event-dataset-2012 huggingface dataset:
Add: EditRouteMapView who listen to onTouchEvent and creates CheckPoints on longtouched location
Add: markers for Checkpoint and a button for create checkpoint  to activity_while_running xml file
Add: mylocationoverlay and button for adding checkpoint on mylocation. Changed mapView to EditRouteMapView
Add: copyright to xml files
Fix: variable names and new/old files to match xml
corrected a typo in accurate_title method that was introduced in commit cb19a45209

Fixes #1928
Squashed all migrations down into one each for core and promo

Spree preferences text field should not have a limit on it

As per this failing build: http://travis-ci.org/#!/spree/spree/jobs/2292654

Squash all promotion migrations into one
Delete old API and start fresh.

Now with ActionController::Metal + Rabl templates.
Move common controller setup into a BaseController class
Show an error if a user does not specify a key for an API request
Pass in a key by default for API requests in tests
Explicitly return if API key is blank
Re-instate loading of decorators back in the engine
Add api key migration
Add spree_auth as a required dependency for API
Need to require Rails in Rakefile

This is because rabl requires Rails.version
Add authenticate_for_api, generate_api_key! and clear_api_key! methods to User
A key must now be specified before making a request to the API
User model spec should have _spec extension
Remove authenticate_for_api method.

Use find_by_api_key instead to get a user, which will then act as the current user
Remove RSpec from backtrace output
Implement beginnings of ProductsController#create API

At the moment, just denies access to it. More to come later.
Move controller setup into its own module

This is so it doesn't crowd up the BaseController
Wrap ProductsController specs in a context for 'as a normal user'
Wrap ProductsController spec in a module so that we don't need to reference Spree::<model> every time we want to
Correct params for create test
Require Spree:Api::ControllerSetup in spree/api
Expand QueueFile test to check for final '5' block.

Closes #7.
Adding the conf folder
Much, much better error reporting from the parser.

Getting proper locations through flex/bison was more effort than
was advertised.
Proper error messages from lexer errors (e.g. bad characters).
More error handling in the parser.

Add a special case in the lexer to detect unterminated strings.
Add some error recovery in the parser for more copious error spam.
Better error handling and messages for invalid index/assign operations.
some debugging
some debugging
some debugging
fixed a bug where generated date was wrong (day > 32 etc etc)
확률 변경
확률 변경
Add pagination for orgUnit.
Add Go Bundle
add interpolate example for Curve and elaborate interpolate's docstring
Merge pull request #1547 from smichr/curve

add interpolate example for Curve and elaborate interpolate's docstring
Go fmt and cleaned up some tack / tackextension err handling.
Deleted homework files.

Deleted homework files.
AMélioration de JQuizz.
Merge branch 'master' of https://github.com/thomasrm/tp

Conflicts:
	public/js/jQuizz.js
Ajoute quizz.css.
Merge branch 'master' of https://github.com/thomasrm/tp
passed one more arg thru
Merge branch 'master' of github.com:tjlane/odin
Merge branch 'master' of github.com:tjlane/odin
Merge branch 'master' of github.com:tjlane/odin
conflict
Add some shadows
adding IO-stringy-2.110
adding xchat-2.8.8
before create zip package remove unnecessary file
fix sass/compass update check
zmiany w c3
view compile problem
Полностью реализован функционал
Refactor echo-request_spec.rb
Reopen log file on SIGHUP. Closes #27.
Reorganize parser/grammar sections
actually build against multiple versions
get badge working correctly
Add missing #includes

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Fix wchar_t format string types

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Purge ‘using namespace std’ from header files

std::bind and boost::lambda::bind don’t mix.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Replace C++0x nullptr with 0

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
debian/control: Remove libprotobuf-lite7 and libutempter0

These are automatically picked up by ${shlibs:Depends}.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Use an aclocal macro directory m4/, and add pkg.m4

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Require Boost

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Replace C++0x lambda with Boost Lambda Library

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Replace C++0x auto with Boost Typeof library

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Compile without --std=c++0x

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Add man pages (closes #7 github issue)
configure.ac: Quote macro arguments

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Merge pull request #17 from andersk/quote

configure.ac: Quote macro arguments
Fix alignment problem under clang (per nelhage)
Better fix to alignment issue
Amend changelogs
Relax debhelper dependency to make build on Ubuntu 10.04 LTS lucid
Relax autoconf dependency
Move from protobuf-lite to protobuf to accommodate Ubuntu lucid

Add changelog entry
Make retry more aggressive even absent new data (fixes #23 github issue)
Fix WMI creation and possible threading error, see comments in memory_snapshot.rb.
close #158 print page template
config/cctest: shelve sync stuff
* Updated spanish translations
* converted more of the geoscape (overlay) stuff to the ui node and made use of the cgame interface

* there are still some TODOs included
* made some code that relies on the uiNode struct of the geoscape node private in the map campaign code
* removed direct render access from cp_map.cpp
* fixed cgame window names
* don't use csi directory in the campaign cgames but use the cgame interface pointer
* added ui_inventory to cgame api
* check for unresolved symbols on linking
* use cgame api

* for Cmd_* functions
* for Com_Error
* for Cvar_* functions
* for XML_* functions
* for Cbuf_* functions
* map [+bridge] minor changes

* due to reported problems with crouching/autostand

Signed-off-by: ShipIt <shipit@users.sourceforge.net>
* map [+b] made doors to surface in workshop tile of base map working

Signed-off-by: ShipIt <shipit@users.sourceforge.net>
* fix doxygen
* add debug_function to delete a mission
* weaken mission load checks: drop only a mission not the whole savegame on error
* save/load alien base index for detected base missions  too
ported mod_uwsgi to apache 2.4
ported mod_Ruwsgi to apache 2.4
initial commit! hello world
Fixed test. It was broken on linux ruby interpreters
nuova modalità di inserimento dei template/sezioni/operazioni
eliminazione file inutile (incorporato nella nuova procedura)
Current version: 0.3.0
fix some fcgi bugs, remain a bug, see #issue
Use double instead of real where appropriate.
restriction on the use of Anvil in Creative mode.

restriction on the use of Anvil in Creative mode.
New regex for RR and DAS
Rename create/modify_time to creation/modification_time
Drastically simplified job completion counter
Adding short count check to readMapData()
added loggers and logobj
manual: combine and update widget sections

--HG--
branch : feature-sphinx
manual: work on display attribute, text encoding and text layout

--HG--
branch : feature-sphinx
add short type
Added quick overview to README
truncate now strips tags
Merge branch 'master' of github.com:wilde4/lava
Adds links to Blaine Cook's slides on webfinger and clarifies some
points in the solution.
0.6.0
Merge branch 'release/0.6' into develop
fixing WSAS-879

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@134451 a5903396-d722-0410-b921-86c7d4935375
Creating constant for dataSourceProps property name

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@130503 a5903396-d722-0410-b921-86c7d4935375
Adding Privileged Action Extension

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@130893 a5903396-d722-0410-b921-86c7d4935375
use linux line endings for bp_classify_hits_kingdom_ben.pl
bugfix
modernise blast db downloader
Merge remote-tracking branch 'origin/master'
Added window for selection of map and joining game
Merge branch 'master' of github.com:xadir/xadir
Added end game button
ssl_conn: changed interface
ssl_conn: more reliability added
Fixes #8  publish to local maven repository
switched to "init" pattern
Merge branch 'master' of https://github.com/xorg62/wmfs
Merge branch 'master' of https://github.com/xorg62/wmfs
fix client ignore_tag rule not beeing applied
fix client ignore_tag rule not beeing applied
Merge branch 'master' of https://github.com/kidanger/wmfs into ignore_tag
Merge pull request #44 from kidanger/ignore_tag

Applique la règle ignore_tag au client
add circular & tabbing in man
*php简易模板

模板 template
Scan result UI tweaks - collapsible info #38
fix SPI_Init and producer function
tweak comments: how to emulate python console?
sort the engine names so it is easier to find the engine in autocompletion in RStudio
add engines for bash and sh; closes #361
news about bash scripts (#361)
bump version
fixed # as scianimator id bug
Merge pull request #319 from taiyun/master

fixed # as scianimator id bug
HTML5 special attributes added
Sort order fix
All HTML5 special attributes added
CHANGELOG
Merge branch 'html5-special-attributes' of git://github.com/creocoder/yii into creocoder-html5-special-attributes

Conflicts:
	CHANGELOG
Changed homepage leading and section leadings to be more actionable and consistent
Remove os and cpu fields from Package, replace them with platforms
Add strict requirement for username & password for package publishing
Elixir now defines an Application.Behaviour
Merge pull request #8 from josevalim/patch-1

Elixir now defines an Application.Behaviour
Updated backslash rule for shell mode.
Redirect output to python variable using =>.
Remove debug info in FontObserver.jsm
initial commit of apty - a simple debian repo manager
README updated with details of how I got everything working in cygwin.
pierwszy commit z netbeans
backport from 1.4: Refactor for new API, removing BC breaks on Hooks and Events.
Fix session expire.
Merge branch '1.3' into 1.4
Merge remote-tracking branch 'origin/release-1.3'
Added DependencyExample
Changed the JRE version.
[maven-release-plugin] rollback the release of hw0-ziy-0.0.1
Corrected many typos. I am shamed
workin EachDescend and EachAscend
added non channel iterators
git rm -r --cache 0_mdrun.py
Merge branch 'master' of github.com:zyxue/pybin
added tprtaker.py
moved mdrun to /home/p/pomes/zyxue/local/ZXeller
markdown synatx
Fixed auth prompt bug
Merge branch 'master' of https://github.com/12k/cheddarb
Merge pull request #1 from 168140/master

roman
algorithm without 2 steps
have to fix 7 step
have to fix 3 and 7 step
dowloaded some implementation
core is done
zmiana interface
add uwsgidecorators.py
wellman第一次修改
WHISTLE-1557: document where the agent manager process fits in
WHISTLE-1441: publisher and API for stats req/resp, and restricting what agent bindings occur
WHISTLE-1577: return the account and agent id the pid() is managing
WHISTLE-1577: add some bindings/responders for the agent manager
WHISTLE-1577: require the supervisor pid, since we're not registering the processes
WHISTLE-1577: given account and agent id, find the acdc_agent_sup pid that represents the agent process group
WHISTLE-1577: start the agent manager in the top level supervisor for ACDc
WHISTLE-1577: small text change for status
WHISTLE-1577: update bindings and remove the need to name the process
WHISTLE-1577: restrict acdc_agent to sync requests in its bindings
WHISTLE-1441: include the whistle_apps lib in rebar.config
WHISTLE-1441: add Caller ID information from the member call to the agent's origination request
WHISTLE-42: update specs for dialyzer
WHISTLE-42: formatting

WHISTLE-42: add fixtures macro

WHISTLE-42: load fixtures file

WHISTLE-42: spec updates and formatting

WHISTLE-42: spec updates, and add rate-id to rating resp

WHISTLE-42: formatting, spec, view option updates

WHISTLE-42: spec updates

WHISTLE-42: spec and formatting updates

WHISTLE-42: spec updates, refresh the rates DB

WHISTLE-42: filelib takes strings, not binaries

WHISTLE-42: use strings, not binaries

WHISTLE-42: add rate_id to view results

WHISTLE-42: use whapps_maintenance to init ratedeck db

WHISTLE-42: use rate_id in the channel vars

WHISTLE-42: convert elements to binary in join_binary

WHISTLE-42: update specs for cb_context record

WHISTLE-42: spec updates, add helper for adding content types

WHISTLE-42: cleanup specs for map

WHISTLE-42: whitespace cleanup

WHISTLE-42: spec update

WHISTLE-42: move superduper admin check to util so all mods can check it

WHISTLE-42: formatting

WHISTLE-42: use common is_superduper_admin

WHISTLE-42: remove unused clause

WHISTLE-42: update specs for dialyzer
WHISTLE-42: fix macro
WHISTLE-42: formatting of spec
WHISTLE-42: move the number_manager lib back to the core lib dir because ecallmgr currently uses to_e164
HELP-2705: support reverse auth for offnet resources
WHISTLE-42: use the proper get_is_true function
WHISTLE-1787: In the user_auth, shared_auth & api_auth, add a field to know if its a reseller or not
+ now using crossbar_util function for auth response
Merge branch 'master' into WHISTLE-1781
Ticket_2
updated product category based on new design
sales report init
localize date
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/sales_list.html
add mail heartbeat change
check Shape in Twist Feature to prevent crash
removed package org.kyocorp.delta.programs
build批处理 & 资源路径修正
Add data provider
Fix BreadcrumbBar
Merge pull request #8 from CalvertYang/master

Fix BreadcrumbBar
Merge pull request #18 from ArcBees/brandon_dependency_upgrades2

Brandon dependency upgrades2
Merge remote-tracking branch 'origin/master' into brandon_dependency_upgrades2
gentleman: ønsk karrysalat
dybber: Overførsel fra dybber til dr_m, godkendt af Dybber
d: ønsk Hytteost (ikke den fedt-fattige!)
⚣: Eggs i dag klokken 12:00, med fmma, dr_ü, Shell-hviskeren, brækpøl, zera, carlsen, d og romanian_boytoy
eggsFactor
Changed the quotes in the travis config
removed redundant definition
Moved ButtonBase. Changed Button to use Rectangle instead of Border in control template.
Focus virtual methods are now event subscriptions but called directly.
Made README for Mac Terminal
Slash notation no longer relevant
Ignore recovering files.
bump version
Merge branch 'objectify'
before project removal move files to project GENERAL fix
Trying to fix asset pipeline through Precompile Array...
Created a basic setup script.
Updated Zaros/Occultus

Added diplomacy music to my civ, and changed the player colour to dark
purple.
Litt gui struktur
Litt mer gui struktur
Merge branch 'master' of https://github.com/Desarc/Veita

Conflicts:
	Fellesregnskap/Controllers/HomeController.cs
	Fellesregnskap/Models/Home/Deltager.cs
Fixed editsmilies.
A couple of API changes and some cleanup. Possibly breaking plugins.
Extended model to support ensemble changes.  Also rationalised model component.
Full component tree rendering
Merge branch 'feature/ensemble_mods' into develop
added read-url device (can be used for importing pl0 modules or simply eading a file online)
added read-url device (can be used for importing pl0 modules or simply reading a file online)
Added lambda-made by JQ , added LogBot , removed google command and smoothed a lot of stuff out
I apperently don't know what a direct link is :P
Add document that describes the testing procedure from the command-line
Started to build menu and profile sections
Info om call for speakers
Fixed some issues with bit length.
サンプルが間違っていたのを修正
[ticket/10970] Removed unused $vars

PHPBB3-10970
Update features-json/sql-storage.json

IE10 doesn't have support for WebSQL either
Merge pull request #28 from EionRobb/patch-1

Update features-json/sql-storage.json
appendix templates
tempalte fixes, flat structure, no working on metrics
Merge branch 'data-api-adapter' into wdat2-develop
Merge branch 'data-api-webworker' into wdat2-develop
First rough version of the metadata tree pesenter.
Merge branch 'presenter' into wdat2-develop
Added custom jQuery-UI lib.
Crude base class for forms.
jQuery-UI
Form in modal dialog
Working base class for forms with validation and inheritance
Final version of form without nested forms
Final version of form without nested forms
Small bugfix in forms
Small bugfix in forms
VPropertyForm and associated test
Draft for property form with suport for multiple values
Version v0.11.0
Merge branch 'editor-forms' into wdat2-develop
don't display some redundant track metadata
tweak export dialog structure
clone the track metadata before munging it when making track metadata dialogs
refactor export machinery: make a mixin for track classes that holds most of the export-dialog stuff, and factor some of the export view machinery out into a common base class
add WIG data export
LugMap.it: aggiunto evento, ConfSL ad Ancona
LugMap.it: aggiunto evento, Risotto 3.0 a Gazzo Veronese
LugMap.it: aggiunto evento, progetto OpenSun a Modica
Merge branch 'lugmap.it' of github.com:Gelma/LugMap into lugmap.it
ToDo: pescaralug.org torna online

Revert "ToDo: http://www.pescaralug.org/ non risponde"

This reverts commit 22ce5871693c3157c99b7f2c192dbfd1181ff1e3.
ToDo: aggiornato situazione http://www.sannioglug.org/ e http://www.alessandria.linux.it/
ToDo: www.imolug.org non risponde
ToDo: iglu.cc.uniud.it e asci.cc.uniud.it non rispondono
ToDo: imolug.org, iglu.cc.uniud.it e asci.cc.uniud.it tornano online
ToDo: http://www.pcofficina.org/ e http://linux-club.org/ non rispondono
db: viene aggiunto http://www.mudilab.eu/ di San Giorgio a Cremano (NA)
Merge branch 'master' into lugmap.linux.it

Conflicts:
	ToDo
Fix crash in PtGetCameraNumber()
Use plString in PtGetCameraNumber()
Merge pull request #241 from Hoikas/camstack

PtGetCameraNumber() fixes
modify to change code_status
add status member instead of called to chip_t
Merge branch 'test'
Got nav-bar highlighting implemented correctly, added 'Contact' page, removed 'tags' from 'entries'
Checkmate 1
Slight structural improvements, commenting
Removed deprecated SpansConcordances
add rope-vim
Modified nsi to include charm.pth, dumped old egg references, and set a TODO for updating charm.pth {VERSION} if not fixed with setup.py.  Installer will also uninstall old version of charm just fine (even though directory structure has changed)
update to docs
small tweak to manifest
Merge branch 'dev' into 2.7-dev
Final draft for presentation
Followers for 2012-11-02 16:00:14 +0100
Modificat petit error amb les dates de l'editor de workflow que feia que si no hi havia data per defecte aparegués la de la fila anterior.
Initial commit
Check in bee.c, update README
Lots of cleanup and things
remove tapestry
New article about encrypt last mile
Ajout des fonctions d'ajout et de suppression de grade
Petits changements dans l'affichage et ajout du début du système de gestion des grades au niveau des membres
Merge branch 'master' of https://github.com/Kamule42/EWO
Merge branch 'master' of https://github.com/Kamule42/EWO
Updated jQuery Docset to version 1.8.2
Updated Redis Docset to version 2.6.6
removed redundant code, improved isRegistered function in JoystickDeviceManager
added isButtonPressed to Joystick
reindent

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
view_list and view_table can now get an endpoint
Changed Progress bar to pin wheel
rejigged the search center box slightly
Removed , from taglists in torrents
Added link to torrent in .torrent comment
git add nclrf/parameter.hpp
added nclrf/functional.hpp
Modifs et clean.
Support for response attributes template update
Support up to 22 args in case classes, tuples (auto-generated)
Use named wireformats, instead of anonymous objects
Merge remote-tracking branch 'origin/master' into cdh3
Add login seeds and instructions
Ball Effects !
Implement repository update over git.
Moved all Nexus into Nexus namespace
Do machine termination in parallel
Refactored model, added asp.net mvc website
#GT-659: Tests are fixed
Improved error checking.

This accounts for observed differences between different versions of
OpenSSL, opting for a consistent error message coming from Ursa, rather
than just letting the OpenSSL error bubble up.
Fixing failing tests by avoiding multiple calls with same parameters
Fix clipping of table captions where there are trailing spaces on the line
rotations fix
language singleton; istring
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/PaLy/alg-vis.git

Conflicts:
	src/algvis/core/Settings.java
	src/algvis/gui/Buttons.java
	src/algvis/gui/Commentary.java
	src/algvis/gui/VisPanel.java
	src/algvis/internationalization/ChButton.java
	src/algvis/internationalization/IButton.java
	src/algvis/internationalization/ICheckBox.java
	src/algvis/internationalization/IComboBox.java
	src/algvis/internationalization/ILabel.java
	src/algvis/internationalization/IMenu.java
	src/algvis/internationalization/IMenuItem.java
	src/algvis/internationalization/IRadioButton.java
	src/algvis/internationalization/Languages.java
	src/algvis/leftistheap/LeftHeap.java
	src/algvis/leftistheap/LeftHeapPanel.java
Merge remote-tracking branch 'kuko/master'
Merge branch 'master' into revision

Conflicts:
	src/algvis/aatree/AAButtons.java
	src/algvis/binomialheap/BinomialHeap.java
	src/algvis/bst/BST.java
	src/algvis/bst/BSTButtons.java
	src/algvis/btree/BTree.java
	src/algvis/btree/BTreeButtons.java
	src/algvis/core/TreeNode.java
	src/algvis/daryheap/DaryHeap.java
	src/algvis/daryheap/DaryHeapButtons.java
	src/algvis/daryheap/DaryHeapInsert.java
	src/algvis/daryheap/DaryHeapNode.java
	src/algvis/gui/AlgVis.java
	src/algvis/gui/Buttons.java
	src/algvis/gui/Commentary.java
	src/algvis/gui/DictButtons.java
	src/algvis/gui/MeldablePQButtons.java
	src/algvis/gui/MeldablePQButtonsNoDecr.java
	src/algvis/gui/PQButtons.java
	src/algvis/gui/VisPanel.java
	src/algvis/heap/Heap.java
	src/algvis/intervaltree/IntervalButtons.java
	src/algvis/leftistheap/LeftHeap.java
	src/algvis/leftistheap/LeftHeapPanel.java
	src/algvis/pairingheap/PairHeapButtons.java
	src/algvis/redblacktree/RBButtons.java
	src/algvis/rotations/RotButtons.java
	src/algvis/scapegoattree/GBTree.java
	src/algvis/skewheap/SkewHeap.java
	src/algvis/skiplist/SkipList.java
	src/algvis/suffixtree/SuffixTreeButtons.java
	src/algvis/trie/TrieButtons.java
	src/algvis/unionfind/UnionFindButtons.java
Application.Quit -> Quit
Updated getters getFullName(), getAllAdresses(), getAllPhones(), getAllEmails() and fixed NullPointerException.
added namespacing, ns.lib, sbsLib for accessing the classes.
Update remove_noise_filter.hpp
Closed #51: Created base service
Merge branch 'i51_create_base_service' into develop
fix Code button in mrakitup
test용 코드 추가
Favor value-level caching over decompressed block-caching in CurlyReader during
compaction.
Fix repositories.
Get rid of a runaway space.
Start on an interface to conch similar to the Python 'sh' lib.
Add some sh-like buffering.
Add let-programs and with-programs.
Smaller anonymous functions are cool.
Add a :seq option to make program functions return a lazy-seq of their output buffer.
Handle both out and err callbacks, allow for full info to be returned, and be gentler with futures.
Handle args to proc.

:redirect-err,
:env,
:dir
Add timeouts.
Support :seq with err.
Recognize verbose option in timeout returns.
Use a cond instead of nested ifs.
Normalize output.
Add polymorphic redirection (functions and files, extensible).
Rewrite everything (pretty much) to make buffering work better with timeouts.
Remove silly excess newlines I was using to test.
Update IFn Redirectable.
Rewrite the File redirectable.
Change number buffering to be smarter.
dokumentointikin pikkuhiljaa valmiina
plotDiffusion.m fixes
cluster run modifications
report: correct way of describing previous simulations
report: smaller images for L60B36
included comet chat in sql_other folder
Removed ui, to deny user to retweet his own tweet
CrazyLogin: fixed outdated code
CrazyCore: added missing method call
App Coffee
App Coffee
Setting var names
ENH: Added bin directory to structure binary directory
ENH: Added support for examples
add diqus suport
Fix indent
removed unused data in mrmarco object
Closes #105 and Closes #103
Cleanup: wa_return_url is never set, so checks are useless
Cleanup: getReturnUrl is always called with the same value, so removing
Removed unused redirect parameters
Allow users to change their username. Closes #105
Allow users to change their username. Closes #107
Merge branch 'master' of github.com:mistermarco/WMD
Grab user's name from LDAP if available and not a duplicate
Updated to version 3.1
Merge pull request #108 from mistermarco/master

Version 3.1
Fix multisearch for search objects.
new tasks are now useable
Debuginfo updated
added chat activity
logical/counter.rbにマジコメと対応するspec追加
bug 5039 has been fixed, requires git dmd currently
Meaning fix :)

Signed-off-by: Turab <ozhan@elmacik.com>
[twgit] Init feature 'feature-58'.
Add Python implementation of Github and Redmine connectors.
#58
Update requires in README.
#58
minor
Merge branch 'feature-58' into release-1.9.0

Conflicts:
	README.md
Update building spawner -- Now spawns as many buildings needed
Basic functionality for easing items usage with containers.
YKLUIView as an alternate UIView implementation that doesn't use traditional UIView subviews.
Button image tweak.
Revert "Comments"

This reverts commit 48aea9334bae656d507b68ffe3868801dbdff7d7.
Test 2
Merge branch 'master' of https://github.com/Zejko/SK-GDV

Conflicts:
	ConsoleApplication1/ConsoleApplication1.cpp
-Removed aurora.dom plugin and made it built in.
-Added an object equality method, but this still needs to be consolidated into the Object prototype
-Added some fonts to the theme for ther new filebrowser plugin that will probably come standard.
-Fixed a bug with the form validators, that caused chrome to fill the Validators Behaviour up rather than updating.
-Fixed a bug in Aurora Administration that set the type name to int and not string
-Deprecated pageRenderedE
-Wrote a sweet multi-file drag and drop upload file manager. With an upload queue you can add to while uploading.
-Implemented a Task Queue and Task stack.
-Fixed a flapjax bug that casued filterRepeatsE to fail when passed an object.
Create MacRuby Browser
call footer
Issue #225: Fix for memleak when loading terrain.
Don't set an underwater environment when there's no water
Fix behaviour of the MapWindow

The map now will track player's position/rotation when
pinned, and will not update if position/rotation didn't
change since last frame.
Implement an Audiere-based decoder
Merge remote branch 'scrawl/occlusionquery'

Reduced cout spam

Conflicts:
	apps/openmw/mwrender/occlusionquery.cpp
Merge remote branch 'chris/sound'
Merge remote branch 'ace/win-fix'
Merge remote branch 'corristo/pgrd-rendering'

reduced cout spam.

Conflicts:
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	components/bsa/bsa_archive.cpp
	libs/openengine/bullet/physic.hpp
fix crash on exit when no user settings exist
adding a setting to disable static geometry
since the default method is not available in older boost we should check by ourselfs if the options are given and dont use notify
Merge branch 'master' into minimap

Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
open file for writing AFTER reading it :)
Merge branch 'master' into gamesettings
added settings for rendering distance of small objects
add settings for viewing distance and fog
FPS is now a setting instead of commandline option
fixed a typo
fallback for ini importer
setting for field of view
Initial HTTP Cache experimentation
Only cache requests issued via GET and HEAD (as per RFC)
Added deniedCallback to CAccessControlFilter and CAccessRule to allow forwarding control to a method on denial
165 - Make CCacheDependency reusable
165 Clean up after feedback
165 Add whitespace
fixing terrible Portuguese typo.
Merge pull request #411 from igorsantos07/master

Fixing typo in pt_br messages
Fix tests for CComponent
Merge pull request #412 from elvan/test-ccomponent

Fix tests for CComponent
Use try-catch block for testing exceptions
Removed unused var
Update ja messages.
Added assertion for attach event handler test
Merge pull request #416 from elvan/test-ccomponent

Test ccomponent
Merge pull request #415 from ranvis/ja

Update Japanese messages
Added note about SORT_DESC to CSort::defaultOrder API doc.
Override CMap::mergeWith() in CAttributesCollection with case-sensitive support
Imrpoved API doc note by adding SORT_ASC to it.
Merge pull request #418 from dmtrs/417-CAttributeCollection.mergeWith-caseSensitive-bug

417 CAttributeCollection mergeWith does not take into account $caseSensitive
Replaced #!/bin/sh with #!/bin/bash in wrapper scripts.
nix init refactor and purge. No sudo is needed from now on.
部分UI更改
Added Single value capabilities for custom SQL.
Fix bug with merged parameters.
Fnn: CsvToPatternList converter updated - normalize refactored, save to csv feature added
Fnn: Run parameters reader updated - default values added
Fnn: interface for callback plotter updated - timestamp argument added
Fnn: plotter updated - setable panel dimension
Fnn: AbstractNode updated - using interfaces
Fnn: OutputNode comments updated
Fnn: backprop & rprop updated - adding timestamp to plotter
Backwards compatibility
Update docs to reflect the recent changes
Update the example post-set hook, remove the pre-set hook code

The pre-set hook wasn't implemented at all, there was just the example
hook.
formularios de devise
para borrar campañas zombies
move to puppet subdir
Added special serialziation for TimestampWritable.
broadcast fix in Mapjoins. Also minimized value wrapping
Added comments, serialization metadata fixes
Merge pull request #35 from HarveyFeng/master

Fix collect() serialization and unwrap key and values for broadcast in mapjoin
ändat så att ParserState nu ändras med State enum som har värden Default och Exit
By fang :changed message module version.
Merge branch 'master' of github.com:andong135/og
Add a new script for reading local currency data.
Updates to in-game help files
Replace all `` with '.  This can be reverted when the RST parser knows what to do with ``.
change angel to ainu
Fix up some of the commands.
Make *enlightenment* potion reveal all monsters on the level
(cherry picked from commit 20132c15d2cadc1220df1666b8a02bd3d9218d08)
Fix double messages on wielding aggravating weapons
After the following changes, the Cocoa port displays non-ASCII UTF-8 characters properly.
Added Term_mbcs_cocoa() to main-cocoa.m since native mbstowcs() does not behave like Linux's.
Converted more types in main-cocoa.m to wchar_t.
Added Cocoa attrOverdrawCache to cache attributes, since we no longer have extra space in charOverdrawCache.
Changed main-cocoa.m:drawGlyphAtIndex() to drawWChar(), which gets glyphs on the fly instead of caching them at game start.
Capitalized Term_text_cocoa().
Changed get_data_directory() to look in same directory as main-crb.c. This location is subject to further review.
Makefile.cocoa fix for case-sensitive HFS+ filesystems.
main-cocoa.m: Changing font size now updates the term size accordingly
(and overrides any old scale factors).
main-cocoa:
  Font changes now only affect frontmost window.
  Ensure main window appears frontmost on load or subwindow option change.
  Change identifier from com.ridiculousfish.Angband to org.rephial.angband.
  Update version string to 3.4.0.
  Change bundle signature from ANGB to A271 for compatibility.
main-cocoa: We now save and restore font preferences for individual terms.
Also, auxiliary terms get sized based on font, rather than screen size.
main-cocoa: Move save/preferences directory to ~/Documents/Angband.
main-cocoa: Better handling of modifier keys by adding takkaria's MODS_INCLUDE macros to send_event().
Moved Makefile.osx to Makefile.crb and Makefile.cocoa to Makefile.osx,
so that the Cocoa port is now default for OS X (and built by the
autobuilder).
main-cocoa: Make Term_mbcs_cocoa() behave like Linux's mbstowcs() when
dest is NULL.
Fix for roguelike 5 to wait instead of run.
Various UTF-8 fixes to main-crb.c, from FAangband and main-cocoa.m.
Per nck_m's suggestion, change default OS X font (crb and cocoa) from
Monaco to Menlo.
Merge pull request #171 from myshkin/master-osx

OS X port changes for 3.4 RC
Added NULL terminating test to player/history.
convert RDFMergerTest to use resource access
convert TagSoupParserTest to use resources
convert Any23Test to use resource fetching
Use ics_mb526 device and ics-plus vendor
add gateway example written in Scala
diff
subtree update
require
[KARAF-2058]ensure find the root instance entry when update root karaf instance name in instances.properties

git-svn-id: https://svn.apache.org/repos/asf/karaf/branches/karaf-2.2.x@1421682 13f79535-47bb-0310-9956-ffa450edef68
Added first batch of 'wip' scripts and updated the readme
base use mocha
mocha test
add new submodule dependencies
Merge branch 'master' of https://github.com/arebgun/bolt
submodules
more cleanup
more cleanup
change update policy for submodules
refactor semantics
Fixed some imports
upsem merging?
demo ready
delete table2d/relation.py
Pawan : Adding urls to external web pages on introduction page
used html validator to fix errors
Retain CEC logical address after hdmi mode change.
Avoid killing composite when attempting to start CEC or HDMI audio
Fix for audio hdmi passthrough, broken in last commit
Fix for ALSA ten second timeout on exit. Fix for volume/mute issues
Add fuzzy matching on hdmi modes with edid_format_smart_match
Merge branch 'master' into debian
adding initial setup files and information
Merge github.com:atcg/MitoNuc
Pushing mandelbrot app.
Merge branch 'kaptcha-0.0.5'
Merge branch 'master' into dev
add scm
bump version kaptcha 0.0.6
bump version kaptcha 0.0.6-SNAPSHOT
Added word wrapping to updated install instructions
Hotfix/ZF2-423, checking if a MVC navigation page is active
Hotfix/ZF2-423, checking if a MVC navigation page is active - refactored condition
Added notEqualTo function to Predicate class
Added test to check proper functionality of notEqualTo function
If a where is called with a null value on update, you will no longer get a fatal error.
Added the test case to check for this scenario.
remove old Zend\Service scripts from demos
tentaive first commit of  to
mail errors fixed
[ZF2-422] Allow configuring display_exceptions flag

- Allows configuring the display_exceptions flag in the
  RouteNotFoundStrategy
[zen-92] cleanup ServiceManager vs ServiceLocator aware

- Removed docblock verbiage about ServiceManagerAware from Navigation
  and Form view helper config classes; copy-and-paste problem only
- Updated Zend\Mvc\Service\ServiceManagerConfig to inject both
  ServiceManagerAware and ServiceLocatorAware classes with the SM
  instance.
Merge remote-tracking branch 'weierophinney/hotfix/zf2-422'
[zen-92][#2012] Added ServiceLocatorAware injector

- to AbstractPluginManager. If there is a parent SM, that is used; if not, the
  plugin manager instance is used. The same pattern is used for
  ServiceManagerAware injection -- if a parent service locator is present and is
  a ServiceManager instance, it's used, otherwise the plugin manager instance is
  used.
[zen-92][#2012] Better ServiceLocator/ServiceManagerAware handling

- Combine both injections into a single initializer
- Use the plugin manager instance for both injections
- MVC should register its initializer to run later in the stack, to
  ensure it "wins" over the abstract plugin manager initializer
Merge pull request #2013 from weierophinney/hotfix/servicemanager-awareinterface

[zen-92] cleanup ServiceManager vs ServiceLocator aware
Merge branch 'hotfix/ZF2-421' of git://github.com/postalservice14/zf2 into postalservice14-hotfix/ZF2-421
Merge branch 'postalservice14-hotfix/ZF2-421'
Add functionality to AbstractTableGateway to not pass the where variable if it's null.
Remove previous change
Change test to reflect changes
Globally remove trailing whitespace

Using php-cs-fixer - http://cs.sensiolabs.org/

php-cs-fixer fix --fixers=trailing_spaces .
s/else if/elseif

php-cs-fixer fix --fixers=elseif .
Run php-cs-fixer after phpunit on travis
Fix travis red line output
Order Dashboard Refinements
intersection by chromosome
Update 1.html

asdfasdf
remove duplicate 'testthat' dependency
  update "do-roxy" for new file path, switch to compiling documentation;
change .par silencing from globalVariable to "<- NULL";
tweak for problematic matrix test (Matrix::all.equal_num)
  require formula to be a formula! (not character)
  add tests for evaluation of formulae in different contexts
  update polytomous example (polytomous package will need to change in future,
now that "character"-type formulae are disallowed)
  update do-roxy to make Rd (for real this time)
  add warning about data= argument
Updated button labels for creating/updating an HOA.
Imported new index page
Test for @error event from loading component
Fixed empty set edges
Moving stuff around to be eclipse friendly
Merge pull request #275 from bholmes/wsq-deadlock-12-04

Work Stealing Queue Deadlock fix.
Fixing some problems with my previous commit.

threadpool.c (async_invoke_thread) :
	1) Decrease the thread pool waiting count if the dequeue was successful.
	2) Do not call dequeue_or_steal while gc skip thread is true.
Adding files for the lab
In the process of improving class splitting
Added Steve Furtick quote
back to touch_app

Signed-off-by: Vito Utro <vito.utro@gmail.com>
price diff nothing if no old price

Signed-off-by: Vito Utro <vito.utro@gmail.com>
filesystem stuff
bug elgg.echo pages degust mobile
Merge branch 'master' of github.com:bpmn/boopvin.git
rosé pétillant, blanc pétillant
final commit (36 failures)
reshuffling some docs
change paste0 to paste (sep="")
Quick fix for potential segfaults
Created.
Update README.md
Merge pull request #1 from jholownia/patch-1

Update README.md
Update README.md
Update README.md
Merge github.com:bsmaldon/lag

Conflicts:
	Makefile.am
	configure.in
	lidarquadtree/configure.in
	lidarquadtree/lidarquadtree.pc
	lidarquadtree/src/Quadtree.cpp
	src/LagDisplay.cpp
	src/LagDisplay.h
	src/LoadWorker.cpp
	src/Profile.cpp
	src/Profile.h
	src/SaveWorker.cpp
	src/SaveWorker.h
	src/TwoDeeOverview.cpp
	src/TwoDeeOverview.h
	src/Worker.h
	src/lag.cpp
	src/ui/FileOpener.cpp
	src/ui/FileSaver.cpp
	src/ui/ProfileWindow.cpp
Merge branch 'testing' of github.com:bsmaldon/lag
Fixes the location of cache files
Merge pull request #11 from bsmaldon/testing

Fixes the location of cache files
Initial non-working commit for issue 9. Refactors some code and places the intended architecture in place.
Fixes rendering race condition and solves a crash
Fixes positioning of point selection boxes
Comment cleanup for merge to testing
Modification to help detect race conditions
Syntax error fix
Default screen size enlargement
Advances the version in preparation for release

I know this doesn't have much meaning at this point with lag having gone
so long without advancing the version number despite numerous updates
and improvements, but I figure a late start is better than nothing.
Merge pull request #12 from bsmaldon/testing

Lag 1.1
Deletes files that were disrupting merge and weren't needed
Updates authors files to include yours truly
typecast value of Storage#keep in Cycler
Merge branch 'fix_cycler_keep' into current
Added randomized x,y position in spawn area

Added randomized x,y position in spawn area
Added Collision detection

Collisions detections works between entities and between player
generated bullets and other entities then the player.
login process, terminal scrolling fixed
Work on reading requests from client
本地化OpenALL的两个按键和信息文字爆击的字段.

Signed-off-by: cadcamzy <cadcamzy@Hotmail.com>
Update session docs for basepath change.
fix grammar in migration guide
Merge pull request #427 from dereuromark/3.0-docs

fix grammar in migration guide
license and copyright, bootstrap css, empty index file for testing
Use display port provided by Fog

Previous to this commit, the VNC port was determined using the
deprecated vnc_port method in Fog.  This commit uses the display[:port]
method.
Use public Fog methods to get public IP address

Previous to this commit, the private method #address was called to get
the public IP address of an instance, which caused an exception.  This
commit calls the public #public_ip_address method instead
Properly determine if a volume or instance exists

Preious to this commit, volumes were determined to exist or not by
calling the Volumes#all method the :name parameter to filter only the
volumes that matched the value of :name.  This was not properly
finding the volumes.  This commit uses the #list_volumes method and
calls #find on the array returned.

Likewise for instances
Properly retrieve version of libvirt

Previous to this commit, the non-existent LibVirt#libversion method was
called to determine the version of libvirt.  This commit calls the
LibVirt#version method.
Lock opened disk image files with O_EXLOCK (same as flock()) on
Mac OS X to prevent concurrent access from the Finder.
Changed entity structuring and added deleting
Nombre corregido :S
add declare to header
Add new ImageCacheImpl::get_tile() overload for getting a tile when you already have a TileID.
Add "vAttachOrWait" to debugserver, so you can implement "attach to the process if it exists OR wait for it" without race conditions.  Use that in lldb.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@160578 91177308-0d34-0410-b5e6-96231b3b80d8
The skipOnLinux decorator wasn't calling the test method correctly (no need to pass in the "self") resulting
in errors on MacOS X for the tests so decorated.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@168662 91177308-0d34-0410-b5e6-96231b3b80d8
Adding a new --python-function (-F) option to breakpoint command add. The option allows the user to specify a Python function name instead of a Python oneliner or interactive script input as a breakpoint command

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@154026 91177308-0d34-0410-b5e6-96231b3b80d8
Add the RelocateOrLoadKernel and LoadKernel methods to ProcessGDBRemote::DoRemoteConnect().  
When attaching to a remote system that does not look like a typical vendor system, and no
executable binary was specified to lldb, check a couple of fixed locations where kernels
running in ASLR mode (slid in memory to a random address) store their load addr when booted
in debug mode, and relocate the symbols or load the kernel wholesale from the host computer
if we can find it.  

<rdar://problem/7714201>


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@164888 91177308-0d34-0410-b5e6-96231b3b80d8
Make the helper functions static. No functional change.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167501 91177308-0d34-0410-b5e6-96231b3b80d8
Also pass logical ops to combineSelectAndUse.

Add these transformations to the existing add/sub ones:

  (and (select cc, -1, c), x) -> (select cc, x, (and, x, c))
  (or  (select cc, 0, c), x)  -> (select cc, x, (or, x, c))
  (xor (select cc, 0, c), x)  -> (select cc, x, (xor, x, c))

The selects can then be transformed to a single predicated instruction
by peephole.

This transformation will make it possible to eliminate the ISD::CAND,
COR, and CXOR custom DAG nodes.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162176 91177308-0d34-0410-b5e6-96231b3b80d8
Also combine zext/sext into selects for ARM.

This turns common i1 patterns into predicated instructions:

  (add (zext cc), x) -> (select cc (add x, 1), x)
  (add (sext cc), x) -> (select cc (add x, -1), x)

For a function like:

  unsigned f(unsigned s, int x) {
    return s + (x>0);
  }

We now produce:

  cmp r1, #0
  it  gt
  addgt.w r0, r0, #1

Instead of:

  movs  r2, #0
  cmp r1, #0
  it  gt
  movgt r2, #1
  add r0, r2

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162177 91177308-0d34-0410-b5e6-96231b3b80d8
Remove unneeded #include.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@168664 91177308-0d34-0410-b5e6-96231b3b80d8
Expand FREM.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153671 91177308-0d34-0410-b5e6-96231b3b80d8
Revert patch. It broke the build.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153314 91177308-0d34-0410-b5e6-96231b3b80d8
Temporarily revert r155364 until the upstream review can complete, per
the stated developer policy.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155373 91177308-0d34-0410-b5e6-96231b3b80d8
initialize fade_time just to be explicit.
Fixed spelling issue
Fixed spelling and added missing space
overview works
Factor out getid() and oomtest()
Minor fixes in invitations and feedback
Minor fix in feedback
isBuddie improved
Home translation (fix #175). Startup improved. Chrome dev mode works now
ext/pcntl/pcntl.c: Fix typo in comment

Signed-off-by: Jille Timmermans <jille@quis.cx>
ext/pcntl/pcntl.c: Fix typo in comment

Signed-off-by: Jille Timmermans <jille@quis.cx>
Merge branch 'sec54' into PHP-5.4

* sec54:
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
Revert "Merge branch 'pull-request/24'" (apply correct workflow)

This reverts commit a00b447b34c21efab393fef063acaae652506938, reversing
changes made to 48daddf093b491d359b77919464827ffb20a3e86.
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)

This reverts commit 55b1e612421c52ea0bb8a3772095c5bbd62045db.
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)

This reverts commit 4aeabaf8e938af00d6fe9f8316251b543640018c.
ext/pcntl/pcntl.c: Fix typo in comment

Signed-off-by: Jille Timmermans <jille@quis.cx>
Merge rebased pull request #24 onto 5.3 into 5.3
Merge branch '5.3' into 5.4

Conflicts:
	main/output.c
Merge branch '5.4'
Merge remote branch 'security/PHP-5.3' into PHP-5.3

* security/PHP-5.3:
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Merge branch 'PHP-5.4'

* PHP-5.4:
This will be PHP 5.3.12
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  This will be PHP 5.3.12

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.4'

* PHP-5.4:
  This will be PHP 5.3.12
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
[#38668489] se craron model,dao, y controller de empleadopuesto
[#38668489] no se puede seguir porque falta el empleado en secion
Merge branch 'master' of https://github.com/jdmr/mateo
Merge branch 'master' of git://github.com/jdmr/mateo
Relación seccion-puesto[Delivered#38192673]
Relación seccion-puesto[Delivered#38192673]
Corregir Pruebas PuestoDaoTest[Deliver#39554797]
Corregir Prueba Puesto [Delivered#39554797]
Merge pull request #57 from irasemabm/master

Corregir Pruebas Puesto [#39554797]
Juntar Constantes en un solo archivo[Finished#39873599]
Juntar Constantes en un solo archivo[Finished#39873599]
Merge pull request #58 from irasemabm/master

Juntar Constantes en un solo archivo [Accepted#39873599]
[delivered#38668685] se subio empleado al ambiente
[delivered#38668685] se arreglaron conflictos
Merge pull request #59 from lobato/master

el empleado ya esta en ambiente
hoja de datos del empleado