labofsahil/github-event-dataset-2012 huggingface dataset:
Switch start and end arrows separately
Use new core::Image::initializeImage()
Updated UML
includes for panopoly make files as well as wrapper functions to action panopoly install tasks/amendments
improved signup and totals with pipeline
ceph: Don't update i_max_size when handling non-auth cap

The cap from non-auth mds doesn't have a meaningful max_size value.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
ceph: Hold caps_list_lock when adjusting caps_{use,total}_count

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
ceph: Fix infinite loop in __wake_requests

__wake_requests() will enter infinite loop if we use it to wake
requests in the session->s_waiting list. __wake_requests() deletes
requests from the list and __do_request() adds requests back to
the list.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
ceph: Don't add dirty inode to dirty list if caps is in migration

Add dirty inode to cap_dirty_migrating list instead, this can avoid
ceph_flush_dirty_caps() entering infinite loop.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
ceph: Fix __ceph_do_pending_vmtruncate

we should set i_truncate_pending to 0 after page cache is truncated
to i_truncate_size

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
ceph: call handle_cap_grant() for cap import message

If client sends cap message that requests new max size during
exporting caps, the exporting MDS will drop the client message.
So the client may wait for the message that updates the max
size forever. call handle_cap_grant() for cap import message
can avoid this issue.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Added context menu plugin for jquery
Changing update date.
fix outgoing msges
tests passing for CondCountsTransformerTests
Merge branch 'master' of github.com:utcompling/Scalabha
Twitter strategy: completed
Dar šiek tiek.
replace for (var..in..) with for(;;)
only accept a number instead of any argument
Collections now appear in newsfeed
Merge branch 'feature/collection-newsfeed' into development
Fixed more coding standards
define submodules
Different styling for output area
- generates records
Added ability to edit tableView
Test commit from the UI
update tracevm package
tracevm
tracevm update
remove compile errors, warnings in tracevm package
update initpacakge interface
enable security policy check stub
add enforce-security option
always deny
update trace interface
revert to default refresh rate
添加show mask 测试
Better check box options for patient information sheets
Minimised hashtag
Request syntax
Refactored event class
Django models fix
Updated MLBS personnel information
Updated task_matrix.csv for MLBS
Improve_the_README_file
Improve_the_README_file
Fix paren in wrong place
added sample bilinear filtering codes and comments for that.
This is the first version of the development code for the adapt_project.  This has a basic admin that allows for uploading files and also has a basic display of the problems.
Mentioned documentation (and how to make it) in the README.
Feedback technology added
gemspecs and other compability configurations
Minor

Tweaks
Version increment to reflect 256-bit keys.
make operator >< and >|<
Attempt 4 at images in the README
small change log update
wxGTK linking fix after r73102.

Remove SendSelectionChangedEvent() declaration, it's now in the base class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
removed README file
edit .gitignore file
- Don't add attachments content into reply/forward/draft message body (#1488557)
Merge branch 'release-0.8' of https://github.com/roundcube/roundcubemail into release-0.8
metainfo completed but failing validate
Merge branch 'master' of github.com:xcore/sc_multi_uart

* 'master' of github.com:xcore/sc_multi_uart:
  Quick start guide comments from Ali, Kris incorporated
  tidyup CRC appender host utility
  tidyup CRC appender host utility
Updated release notes, added tunnelling information
Added a test name to all itests which should make them easier to find in TestNG's HTML reports.
Update README.md

minimal
300html exit
XCOMMONS-138: Add new XWiki Commons Text module for text-related generic APIs
XCOMMONS-230: Add Provider to get the "context" ComponentManager
changed command import
Fix WildcardQueryBuilder when only rewrite is changed

If only the rewrite field is changed, and not the boost one,
the serilization did not write the rewrite field.
初步完成侧边栏最新发表功能
スライサブル章のタイトルを他に合わせて変更
DIY の章 初校からのバックポート
Merge branch 'master' of https://github.com/yasuhito/trema-book
Added Project Files module to projectView.
Remove unneeded mtl dep
..8
add recommend func
Set view controller for iPad
create color compair function
Git ignore reports spec makes
Refactoring:

Removed unused imports and task comments
Add new transaction:

Added method to TransactionProvider which provides new transaction saving
Add New Transaction:

Changed TransactionsManager to provide new transaction saving (calling necessary method from Transaction provider)
Add New Transaction:

Added TransactionValidator which provides validation of newly created Transaction instance.
Add New Transaction, Refactoring:

Changed architecture to use one properties file for all error messages. Changed it's location to correspond validator's package name
Add New Transaction:

Added property editor to provide form params converting from String to Account instance and vice versa
Add New Transaction:

Changed TransactionListController to provide new transaction adding mapping and validating
Add New Transaction:

Frontend for add new transaction story
Refactoring:

No comments
Removes vtmx and vhea tables; sanitizes fpgm and prep
test play with pybedtools
support perlbrew lib
fix issue for ramdisk
Merge branch 'develop'
Merge branch 'develop'

* develop:
  moving everything to the wid command
  changing what info is displayed in the show script
fixing merge
Merge branch 'develop'

* develop:
  removing unused scripts
fixing other merge
Merge branch 'develop'

* develop:
  adding in some email stuff
Merge branch 'develop'

* develop:
  changing up how commands are ran
  cleaning up imports
Merge branch 'develop'

* develop:
  a bit of drunk coding
Merge branch 'develop'

* develop:
  there is no need for that function
Merge branch 'develop'

* develop:
  adding in documentation and doctest
  updating documentation and adding in scripts
  turning this into a package
  cleaning up code
Merge branch 'develop'

* develop:
  adding in githolder files for the static and templates dir
Merge branch 'develop'

* develop:
  fixing missing attribute
Merge branch 'develop'

* develop:
  updating stuff
Merge branch 'develop'

* develop:
  changing Topic
adding in the mainfiest
Merge branch 'develop'

* develop:
  adding in the mainfiest
removing the long description
Merge branch 'develop'

* develop:
  removing the long description
Merge branch 'master' into develop
Install Solarized theme for VIM
piston commit
* Random DateTime generator
Donation button
* Serial type handling
* New field types: duplicate, word
Add the README.md
Fixed the spec_helper
将AlloyTeam的AlloyTimer项目全站下载，并去掉腾讯的GoogleAnolysis，增加了版权说明。
增加安装方法
Modifications to make the code runnable with Python 2.6.x
more spec 1.0 additions and bug fixes
 - Added improved and more thorough support for complex typing of model properties
    - __see the readme.md for details of implementation__
 - added more granular testing of entity parsing classes (currently +/- 88% code coverage more to follow)
 - updates to the readme.md to reflect recent additions.

fixes #5
Merge pull request #8 from zircote/feature/detailed-property-type-handling

more spec 1.0 additions and bug fixes
Update zh/ruby-beginner-en-mzrZ6.yml
Section 1, Exercise 5
Update index.html
Merge pull request #1 from koral/master

test
Voted on TS-1116
[TS-1116] Fix build issues with clang + gcc4.7
Review/Test: briang, igalic, zwoop
Backport: briang
New graphics, background, player token, and settings screen.
initial
griff config
adding base twilio controller
adding servicerequest
fix bug
fix bug
up timeout
up timeout again
change xml type
adding signalr
updating call logic
updating jquery
updating jquery #2
turning custom errors off
fixing signalr error
fixing static constructor issue
adding call duration
adding call duration update
duration doesn't work, removed.
adding wijpiechart
1.8.7 & 1.9.2 are obsolete in 2012
some smarty fixes
Ceonex
HootSuite
[RubyForge] Add coverage
[AccessNow.org] Cosmetics
AccessLabs
[AccessNow.org] Secure cookies, don't force www
[Adobe] Add coverage
[American Chemical Society] Add coverage
PBase
Shutterfly
[Phoronix Media] Fix

https://trac.torproject.org/projects/tor/ticket/5728
[Phoronix Media] Cosmetics
VMware
[MaxMind] Cosmetics
[MaxMind] Secure cookies, don't force www
Private Internet Access
BitInstant
Netveano
Memorydealers
[Mt.Gox] Secure cookie
[Mt.Gox] Cosmetics, don't force www
Xagasoft
BTC Buy
BTCSportsBet
BTCZone
Bitcoin Wiki
Bitcoin Börse
Bitcoin VPS
Bitmit
Christian Prayer Center
Adding Console Log to CLI

  * Fixes bug 957518
  * Command is as follows: nova console-log <serverid> --length=20
  * Also updated the readme with new cli output.

Change-Id: I7874c7c9533b5389f7107ae375d4fa9f8fee7c49
Open Folsom

Switch version to 2012.2 to open Folsom cycle.

Change-Id: I8bc51e436b09e68275424914c43f4f2717045956
Changed sequence and index page for large video image
Upgraded MVC samples from MVC v2 to v3.
Removed the assemblyBinding web.config content merge from NuGet.

NuGet performs the merge incorrectly, corrupting the user's previous redirect entries and nullifying both redirects.
Removed not applicable comment from web.config nuget merge file.
Removed "ReleaseNoUI" solution configuration.
Adjusted OAuth 2.0 resource server's port number so as to not conflict with OAuth 1.0 service provider sample.
Incremented the OAuth 2.0 client sample's port # so as to not conflict with the OAuth 1.0 consumer sample.
Fix for NullReferenceException in the OAuth 1.0 demo due to HttpRequestInfo not initializing one of its fields.

Fixes #97
Switches the NuGet installer to make .NET 4.0 targeting web sites work out of the box.

This sacrifices the out-of-box experience of .NET 3.5 targeting web sites, since we have to choose between them.  But I've added a comment so that .NET 3.5'vers will quickly be drawn to the reason for the failure.

Fixes #98
Removed advertisement that the DNOA package includes OAuth2 packages.
Incremented OAuth2 package version.
Incremented version numbers following v4.0.0 release.
Updated more references to MVC 3.
Fixed sqlproj sql deployment to RelyingPartyLogic assembly.
Removed this obsession the db has with Path1, which is meaningless.
Merged v4.0
Restored script generation in project template to fix build break (Until we can figure out a way to really use .dacpac and sqlpackage/msdeploy.)
Repaired sln file from Dev11 beta bugs.
Added Montenegro and Serbia and some fixes
updated the extension installer.
Merge pull request #95 from ADDCreative/patch14

Added Montenegro and Serbia and some fixes
stupid fedex mistake fixed for zone code problem
added jquery carosel
added jquery carosel
frameworks/base: Increase Zygote preload GC threshold.

Increase Zygote preload GC threshold to half of the heapgrowthlimit,
to reduce boot up time.

Change-Id: I74a68a512c2266ac6e62f09f361f8607251ca9a7
Merge "frameworks/base: Increase Zygote preload GC threshold." into jb
am: Don't crash if cacheDir can't be created

 * Due to a bug in the multiuser code, it's possible for us to reach
   here by loading framework-res for a different user in which case the
   cache dir can't be created.
 * Add a null check to avoid the crash and subsequent lockup of AM.

Change-Id: I12f3a207d9fa0111286a67e29652f808ad5d9410
Merge "am: Don't crash if cacheDir can't be created" into jb
Update notes for submitted changes

* Telephony: Optimizations on alarms used
Update notes for submitted changes

* Base: Fixed czech translation
Aaron, add view controller
Bukkit plugin - BigOne Time
melee mit "C"
changed the weldrate
修正ArrayList对象返回值的bug。
Started work on redundant method remover, almost done. Phase 2 needs fixing.
2624
fixed an oversight in header parsing .. ( Cookies were stored in Referer strings :P ) , also added double checking of mallocs ..
divergence nice file
send_json to an url with curl
revert order
Merge branch 'master' of github:AndreaCrotti/scripts
Verison 0.0.2a

Code update (untested)
Site updated at 2012-12-30 21:41:59 UTC
updates necessary to build against latest centos
Merge pull request #1 from nicolasochem/master

build against latest cents

Reviewed
run: save original config, too
rename and delete functions - try 1
new change 2001
Update Log.
[Multithreading] FutureTest fertig.
merge
Improved code for suppressing (+) No Abnormalities and (and added for MM-411) Not Assessed (4) style of text.
Added weight in pounds, E16_88, MM-413.
Added the new Personal Items E35 data elements. MM-412
New v0.2.13 adds better suppression of assessment repeats; uses weight in pounds field,; added personal items fields.
Merge branch 'some_more_tweaks_post_mm_401' into develop
Added more tests, better code coverage.

Small adjustments of flg, sim and new$hash
Fix for when instances exist that have no tags
Split exported methods over mutliple lines
r.e. adds
réorganisation totale et quasi finale !
Physics

not done yet okay gosh.
Fixed everything gg
New Physics

Fixed the bug where entites would snag on tiles. I'll work on adding
walk over entities and ramps next.
Only force the symlink to upstart if upstart is installed
modified the documents
Quarter wall slabs
Views are improved
Adding unit tests to solution
converted to js from coffee, added initial modal implementation
Fixed audio reseting
Pushed changes regarding grouping sorts and core limit returns.
adding login /registation
login /registration added
fixed line number toggle command
changed namespace snippet
Fixing sed syntax in Makefile
Removed unnecessary tab characters
annotation's added
fixed a compilation issue with freetype
Merge branch 'master' of github.com:DaGaMs/freetype2-ios

Conflicts:
	freetype2.xcodeproj/project.pbxproj
for consistancy
Delete fix op Server

kijk maar e
Try a new way of handling whitespaces

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Ignore TAGS file

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Looks like this advice is useless

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Dired file management

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Add missing quote

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Use github's https method by default

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Configure notmuch-labeler

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Create a function to handle PATH to use it in other places

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Use el-get to install notmuch now

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Use my own recipe for notmuch

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Add a recipe for shampoo/Smalltalk

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Set notmuch

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Ignore some more files

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Replace tabs with spaces

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Adds dired+

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Replaces tabs by spaces

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Split classes out into two files
Updated the dnacode main to genetics, add arrays.search
Moved correlation into regression
Renamed regression to statistics
renaming topshelf bit to use bottle
removing unused code
some renames and obsoletes
Cleaning up links code and moving into service
cleaning up bottle explosion
Add PostFile to EndpointDriver
Add debugging output ot EnpointDriver
Add User Agent to Get requests from EndpointDriver

#328
Add ASP.NET file upload end-to-end tests #328
Add file upload form for easier manual testing #328
Fix file upload problem #328
Add more ASP.NET model binding end-to-end tests #328
Add both types of file binding to HelloWorld as demonstration

Closes #328
pulled over the code manually for the asset combination warmup, closes GH-254
Latches double imports of FubuRegistry, verifies the double import of policies/conventions.  Closes GH-182.  Closes GH-183
All un-attached views are added as 'actionless views' by default.  Closes GH-301
added the CacheAttributePolicy so that you can use [Cache] on view models for actionless views.  Closes GH-123 in passing
разбита функция douglasPeucker
Ver envíos de los clientes
updates to latest ember version (0.9.5)
updates gemfile
Added mkdir -p ~/Library/Scripts/Folder\ Action\ Scripts

Added mkdir -p ~/Library/Scripts/Folder\ Action\ Scripts in case the
directory/folder did not exists.
Adding some project notes
Fix some strangler issues for FreeBSD port.

Patches are no longer required and the port does not need a REVISION number.
Update release script to use current branch, not master, for distfiles.
Update distinfo to reflect fixes release file for 0.1.4.
Use the standard '$FreeBSD$' tag instead of the expanded form in ports.
Merge branch 'release-0.1.4-f1'
Fix assertion error for Port.build_stage().

The check for stage and dependency needs to be combined as dependency is only
available when stage >= Port.DEPEND.  This was a translation error from the
checks below (as the asserts were introduced for a loud failure vs silent).
Correctly answer "yes" to all pkgng questions.

A dyslexic error resulted in the incorrect os.environ being set causing
`pkg install` and possibly `pkg add` to fail with status == SUCCESS but without
actually installing a package.
Be more verbose about expressing "yes" for `pkg install` command.

This is useful in '-n' mode as it is clear to the user that "yes" is being
expressed (as ASSUME_ALWAYS_YES is transparent).
Be verbose about what pkg command is being executed.
Update TODO and ChangeLog to reflect changes in 'hotfix-0.1.4.1' branch.
Prepare for release of 0.1.4.1

Update:
 - version tags in setup.py, portbuilder, port/Makefile and ChangeLog
 - date of this release in ChangeLog
 - setup.py:
   - package directories
   - scripts
 - ports:
   - pkg-descr
   - COMMENT
   - pkg-plist
Update distinfo for 0.1.4.1 release tarball
Add template entry for next release's ChangeLog
Merge branch 'hotfix-0.1.4.1'
added explosion effects
pagina do Vincent
small fixes
Merge branch 'master' of https://github.com/EMCC/S-P-Indices-POC
Handle exceptions when applying filters.
Merge branch 'master' of github.com:Eckankar/RandomImgur
changes
alterações
adicao de novas funcionalidades
todas as alteracoes
Shows an error on report view if it cannot draw the Gantt Chart
rotation now also on Android, better event method
Fixed Google Chrome bug
fixed query grouping when using where($array) syntax

on request of Phil
Merge pull request #1517 from WanWizard/develop

fixed query grouping when using where($array) syntax
Core/ScriptMgr: Implement PlayerScript Hook for OnEquipItem
* used in LFG Instance Lock Update due to item level relevance
improves tests and ads example response to the api documentation
exception handling or the assignment upload
more error handling on assignment upload render and return on error, catch exception if it occurs
ads more error handling and logging to file upload api
ads new logging to assignment api
ads new logging to assignment api and fixes likely bug
ads more error handling and logging to file upload api and ads return after all renders
ads new logging to assignment api and fixes likely bug
more logging to find the troublespot
used unlesss instead of if.... mistake fixed
fixes test
modified quiz_lib to properly return result of success or failure on quiz save, fixed quiz_save test if message is success, meaning the quiz is complete and previously untaken -- this will have to change in future if we allow multiple attempts
verifies it is not nil prior to matching on amazon for url field ... but without a syntax error :)
FIX: Making plotting better
Contains ha plugin
Fixes workaround if someone has a savefile and is taken off the alien whitelist.
add linenos and emphasize-lines support to rst directive
Code blocks regex now captures all pygments short-names
Merge pull request #123 from shreyankg/master

Landslide now understands pygments lexer names with special characters in them
Use configured encoding when reading all embedded files.
Merge pull request #125 from iguananaut/embed-encoding

Use configured encoding when reading all embedded files.
Merge branch 'master' into rst-linenos
Correctly embed theme images regardless of whether it is in a custom theme directory, relative the custom css file or in a built-in theme. Also if base64 encoding fails for an image, continue to render. Based on ackdesha's patch in PR 110
Merge pull request #126 from akrabat/embedded-images-in-local-css

fix to embed images defined in CSS
Merge pull request #97 from copelco/rst-linenos

Allow for line numbers and emphasis with reStructuredText
I've added ajax to login page
WTF: Mob armor
1.4 functions
Added support for platforms.
Merge branch 'Chris' into Chris-experimental
Added the ability to add new platforms.
Merge branch 'Chris-experimental'

Conflicts:
	src/com/emjebity/bouncedem/BounceDemoActivity.java
Updates diagram to include proposed refacting of place.
Renaming Place to PlaceReference; adding PlaceDescription
Additional changes to implement the new representation of places in GEDCOM X.
Adds identifiers to the UML representation of PlaceDescription.
Adjustments to naming and serialization to conform to patterns already in use in other parts of the model.
First cut at updating the conceptual model specification to reflect the changes we are making to the representation of places in GEDCOM X.
Updated the diagram to reflect a change in the name of the reference to a place description in PlaceReference.
An attempt to tighten the specification for latitude and longitude values.
Adds missing constraint pointed out by @jralls.  Thank you.
Updates to the serialization specifications to reflect the changes/additions being made to the representation of place metadata in GEDCOM X.
Attempt to clarify value ranges for latitude and longitude.
Merge pull request #79 from FamilySearch/place-model

support for first-class place model

We __*thank*__ all of you who have contributed ideas and feedback on this issue.  We value your input and feel that the model has become better because of your contributions.
consolidating logic for extensibility into a single base class. NameForm should be extensible.
css mensajes de error
Initial Release: HBase Schema for Web Crawler

Signed-off-by: Tokenizer <fuad.efendi@tokenizer.ca>
add prefix_size option
update readme
clean up options on img element
Update 3D.html
Meilleure utilisation des Fragment et FragmentPagerAdapter, modele instancie dans la classe FormaDroid
final android commit of stage 1
testing push attribution again
Some bug fixes in the suggestion algorithm. Now highlights all of the blocks that are included in the suggestion. I wanted it to highlight only those that were not part of the selected set, but I didn't have time to fix the CSS.
Change widget heights
more highscore
added track queueueing
auto merge commit
Robot+DirectionCalc
Merge pull request #2 from Gurr3/developing

Developing
this is a commit
merge conflict done
Merge pull request #9 from CompanionComputer/master

pull me maybe
did some stuff late @ friday
Merge branch 'developing' of github.com:Gurr3/CompanionBalls into developing
gurr3 pull me
did some stuff early at loordag, then i pulled some better code
Merge branch 'master' of github.com:bloodswtf/CompanionBalls into developing
Merge pull request #10 from bloodswtf/master

pulle me nao
Merge branch 'developing' of github.com:Gurr3/CompanionBalls into developing
server+client borde funka nu
kommentar
conflict averted?
working client
hrhr pull my finger
fixed merge conflicts
made some quick fixes to merge the client and server socket code
Merge pull request #12 from Gurr3/developing

updating the master to match the working developing code
ai trying to damage son
[0.4.42.9]
  Fixes:
  - Frame and bone matrices can be edited on SRT and Matrix; updating the corresponding matrix after each input of a cell
  - CopyNormalsNear, CopyBonesNear didn't find Normals/Bones for destination vertices exceeding source vertices
  - Replace mesh couldn't compute matrix transform for world coordinates option
  - Changes in frame's and bone's SRTs not applied : dataGridViews for SRT and Matrix update each other after CellValueChanged
  - Names in cross references abbreviated after renaming (ended with '...')
  - Removing a material didn't clear the editor
Test image adding to README
Merge pull request #6 from HarshitaMeena/master

instructor exercises
Merge pull request #7 from HarshitaMeena/master

deadline on exercise page
Merge pull request #8 from HarshitaMeena/master

exercise improved
merges and starting XData integration
profiles
Add Jquery. And 2 test pages with an Ajax query
Der kan nu oprettes medarbejder og kunder
Modified dbObject.php
Merge branch 'master' of github.com:ICSSC/WebDevWorkshop
$matches can be null!
fix add user token
handle out of idea case
Changed all setId calls to getStyleClass().add calls
Produce sane answers for diskspace remaining. Fixes #8
Now prints % missed samples. Closes #1
Unit test fix
Merge remote branch 'origin/develop' into develop
First Interactiv UI to test block stability - first triangle
hidepaint my nigga
Potentially fixed the killer player trading bug.
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption
Added the state change from client to mainmenustate
Merge branch 'master' into Stephen_Working

Conflicts:
	src/client/client.cpp
Added the code to get the gameplaystate rendering
and added to the ignore file
Merge remote-tracking branch 'remotes/origin/Stephen_Working' into Aaron_Working

Conflicts:
	src/client/client.cpp
fixed errors when merging between stephen_working and aaron_working
Updated server interface and added context menu support.
Merge branch 'Jeaye_Working'
Cleanup in gameplay state and context menu shit.
updated
Merge branch 'master' into Rob_Working

Conflicts:
	src/client/states/gamePlayState.cpp
Fix algebra error causing car to drive incorrectly, add test buttons
Fix androidvncserver -h print_usage error
tryout-androidvncserver file suinput.c and fbvncserver work
Updates on layout and behaviour from the website
Update the description of what the code does
Remove 'stub' comment.
new line
Not using director
A* for pathfinding
Required astar-for-entities
Added key bind for MOUSE1
Basic pathfinding and path following works
Socket server referenced by local IP, not localhost name
A-Star path is calculated still, but player does not walk path
Modified to skip checking of diagonal movement
Changed screen resolution to match GBA
Added tree buffers around sides
Started but incomplete
Initial code commit. Part II
Added some informative messages
Minor fixes. Now only problem is that the fname seems to be a mess of special characters instead of a proper filename
Add 'Add Player' action to player list menu.
bugfix on user experiment excample
add new linker scripts and header updates
More documentation rewriting
Added development mode for reprocessing of resources
engine.io: added middleware attachment possibility (eg: for express)
test: adapted version checking for 0.4
package: bumped versions
Track our webkit,LegacyCamera,Gallery,device trees

Now that all these stuff are patched for old phones,we'd better add them to the manifest ;)
Added filters to EBUCoreProcessor for categorisation of source files into project folders.
Part 1/2 update the manifest! \o/
Remove Unwanted Repos/Add SamsungServiceMode Repo
Added CLF2 theme
unserialize() of negative float numbers fix

git-tfs-id: [http://falcon:8080/tfs/Projects]$/Phalanger/Main;C2942
Move sqlite to Extensions directory
Corrected/added some bits to ReflectionClass
Merge remote-tracking branch 'upstream/master'
Fix helper method path
Implement method to get collection path
Use path method from collection model
add auth stuff to base controller
create event functionality
The authentication works just fine !
fixed doxigen warnings

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Ticket #2888: code cleanup before 4.8.7 release.

src/filemanager/dir.c: refactored growing of dir_list into a separate
function.

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
(ftpfs_file_store): type accuracy and simplify conditions.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(fish_file_store): type accuracy to avoid counter overflow while copiyng huge files.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(fish_file_store): remove unnecessary 'was_error' variable.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
(fish_linear_abort): type accuracy.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
lib/strutil/strverscmp.c: add missing include of config.h.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(exit_subshell): return gboolean instead of int.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Init file highlighting only in full mode.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Tweak sources for --with-x/--without-x option.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Don't exit after migration of configuration files.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Fixups of SIGWINCH handling.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Define winch_flag as vilatile sig_atomic_t.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Clarify of sig_atomic_t usage (got from Mutt).

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
bcm2835-bootloader: update to bcm2835-bootloader-db62088

Signed-off-by: Stephan Raue <stephan@openelec.tv>
bcm2835-driver: update to bcm2835-driver-db62088

Signed-off-by: Stephan Raue <stephan@openelec.tv>
linux: update RPi patches

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-frodo: update to xbmc-frodo-f13566b

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-pvr-addons: update to xbmc-pvr-addons-9e7a5ba

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge remote-tracking branch 'upstream/master'
Site updated at 2012-10-20 12:49:38 UTC
quick query instead of using loadMemberData

Signed-off-by: Jessica Gonzalez <suki@missallsunday.com>
Update the regex for the mention

Signed-off-by: Jessica Gonzalez <suki@missallsunday.com>
More changes for the mention

Signed-off-by: Jessica Gonzalez <suki@missallsunday.com>
Added message handling for skip functionality. Also added populating a client list.
update client card flags
Fix a little bug of Shichou
Wrote Python bot on the 15th, uploading code

Please read readme.
fix to pokedex crash
water pokemon now stick to their depth ranges
Merge remote-tracking branch 'origin/master'
Simplified and generalised packet handling system.  Fixed gui display
for learn Move in smp
Merge remote-tracking branch 'origin/master'
Updated readme with clone instructions
Chapter 38 Homework Completed

Fixed the insert issue with AddressID primary key value
add a little "warning" about itemtemplate's name & case
gui ja jotain pieniä muutoksia muualle
pientä manhattanin alkua
removed some logs etc
1) Refresh reminders every 15 days, also refresh if no reminders are stored. 2) Store FB access token in DB, 3) Development flash message for now
Bugfix for picking up duplicate items

Can no longer pickup blood
math: add public references to ease the access.

add x, y and z as public references of Vector2 resp. Vector3 classes,
that reference the according field of m_data variable in the Vector
class.

Conflicts:

	src/math/include/global.h
Fill join us block using settings, render it as markdown
Added bootstrap, jquery for draft usage page openconext.api
tools/mkpkg: add script to checkout and repack 'xbmc-pvr-addons' for xbmc-frodo

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-pvr-addons: update to xbmc-pvr-addons-57169bd

Signed-off-by: Stephan Raue <stephan@openelec.tv>
projects/ATV/linux: add USB sound support, this should fix #1679

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-addon-xvdr: update to xbmc-addon-xvdr-8fc8607

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-pvr-addons: update to xbmc-pvr-addons-5f97406

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0
remove methods on array
update arrays
add simple map without comparator
log
t
test
test
bounded double value
add required payment parameter to subscription methods, change customer to client in subscription model
remove unnecessary imports
Removed log and debug statement
delete main window
Source do mapafortaleza adicionado para ser utilizado como poronto de partida.

Source do mapafortaleza adicionado para ser utilizado como poronto de
partida.
add spot project file
add license
update PlateShell windows submodule path fix, submodules can be add by number multiple submodules can be added with one command. fixes issue 17, fixes issue 19
update skel
remove css and meta methods from htmlplus helper 2.1 has blocks
update plate shell init is passed working dir and use api.cakepackages.com a temp fix to make search work
add Ben McClure menu and Slywalker TwitterBootstrap submodules
Merge pull request #23 from sams/master

fixes and skel update
Added JSON Gem to Gemfile manifest and added a fake API respone to application.
Merge branch 'master' into wip
Lights the LEDs on the QBar Graph proportionate to an ArduSensor
Behaviour durden_transport changed; Cleanup.

* replace try_handle with can_handle, parse_request, render_response, render_error
* Removing unnecessary stdouts
copy dummy files to server AND client
TDTrueCopy: do not allow issuance to non-current records

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
Post Land RPU Items to support land actual use reporting

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
Consolidate td report formats (standard, annotated, truecopy,
annotated-truecopy) into a single report
and remove redundant report formats

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
Realty Tax Notice of Delinquency : initial commit

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
LandTaxReportService: fix invalid variable

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
LandRPUService: temporary fix for land adjustment and land actualuse adjustment bug

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
RPTReceipt : set period for manual collection

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
faas.xml : add disapprovedfaas schema which is missing during the merge

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
ProvinceFAASService: add support to post realty ledger in the province

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
Merge with ETRACS2.0 Updates

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
added realpropertytable to index the realproperty information

Conflicts:

	services/rpt-services.jar/META-INF/interceptors.conf
Real Property Update: added support to also update the realproperty index table during approval
rpt-rule-mgmt:
- removed rule spelling workunits

rpt-services and rpt2 client:
- added the parentid and parentcode in the landassesslevel

updated mssql migration script

Conflicts:

	migration/version1-to-2-mssql/xetracs1-migration-services.jar/META-INF/scripts/RPTV1MigrationService

Conflicts:

	services/rpt-services.jar/META-INF/scripts/LandRPUService
Land Adjustment: based lookup on assesslevelparentid
 - add landassesslevel script to add parentid and parentcode fields
RIV : change permission for RIV Collector to riv.collector
Liquidation: Hide RCD by Fund for single cashier liquidation
RPTManaulCollectionDetailPage: update amount for any changes in basic/sef info
The more readable version with improved editing things :D
Merge branch 'master' of github.com:shahinism/Negar
New char_translator function
Do not change English numbers in English string
Command line argument included
Version 0.2
Update README.md
Version 2.0
Merge branch 'master' of github.com:shahinism/Negar
Update README.md
 char_translator Exception ;)
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	Virastar.py
	example/input_test.txt~
	example/output
	example/output~
Added constructors, added dye grinding recipes
basic tomato features added
DB/SAI: bigest script pack for Tanaris zone
suggestions implemented, adding tags

Test: "En la esquina de corrientes y uruguay esta guerrin, justo al
ladodel lorange, esta guerrin, una gran pizzeria. Tambien hay una
sucursal en pueyrredon al 600"
added reminder to add dirs to git
LucidJS.emitter no longer will over write existing emitters.
user_merge and voterecord_associate scripts added
fixed up style on the results page
Added aditional text to the help message
Update src/ml/homework/knn/algo/KNN.java

Formatting
[z1822] Revert "[z1809] add negative auras, channeled and regeneration spells immunity for totems"

This reverts commit 262907bdf69b2750c37a1daf3b908db406c49475.

Signed-off-by: Salja <salja2012@hotmail.de>
new colors for selected desktop
removing utc time
Added function to send RST links to a user via PM
Registered command for bot_sendapirst() to be called.
- Ver.2.0 development is started.

- Implemented :NeoBundleClean completion.
- Improved reload behavior.
- Improved :NeoBundleClean behavior.
- Added test.
- Updated vital.
- Added g:neobundle_rm_command option.
- Use system in clean.
- Fixed vimproc check.
corrected Gemfile for DB and heroku
about page fonts are changed
Removed movementspeed, and TODOs
Fix the reStructuredText access point.
fixed bug null unknown value type interceptor + added missing byte and char arrays to known types + updated tests + incremented package version
Merge branch 'master' of github.com:Sinbadsoft/MonkeyOrm
Update Holo Launcher HD

Change-Id: I0a8389c49e23999433743e3bd3246aeb73f89dd3
added config to staging
polyline: Remove deleted marker from internal list

When marker is deleted from line it's left in internal _markers list.
Merge pull request #700 from shramov/polyline-edit-fix

polyline: Remove deleted marker from internal list
Merge branch 'master' into ssengine-compatibility
updated build
Express server to compile Echoes.
Prune
Add vacation support.
Improve presentation of vacation.
Get rid of superfluous semicolon.
Add scheduled vacation to project view.
Add scheduled vacation page.
Add items.
Remove superfluous stuff.
patched for hardcoded ctl file location in vtproxy
Modify the file encoding to UTF-8.
Update tvheadend
Merge branch 'develop' of github.com:SynoCommunity/spksrc into develop
updated/simplified? classpath
core/Makefile: avoid exceeding MAX_ARG_STRLEN

The current method of generating the apkcerts file can fail with
a "make: execvp: /bin/bash: Argument list too long" when the path
to the toplevel directory is long enough.

In my case, the MAX_ARG_STRLEN of 131072 was exceeded with a toplevel
directory length of 52 (with 427 apkcerts).

This reduces the length of the command-line string generated by not
repeating the output path for each entry (it cd's there first).

Change-Id: I9739f9aefdf5e0febed66517c7b418a4041f49f6
build: Use newline at the end of echo to apkcerts file

Revert "core/Makefile: avoid exceeding MAX_ARG_STRLEN"
This reverts commit 2eb4ca0fefd32a8eb3280139f3a91d5675c2c9f2.

If a newline is not used, the echo commands are strung
together in one large command. In environments with long
pathnames, this can cause the error:
  "make: execvp: /bin/bash: Argument list too long"

This splits the echo commands up into individual commands
to avoid the argument limit.

Change-Id: Id2e5033ad51a9746e2b6cd88f9d53d5b7c93bc1b
build-with-colors: moar colors

- rename CL_PFX and CL_INS to better match the
  colors they show.
- add more colors.

Output of:
- most host stuff is yellow
- most target stuff is green
- installing/copying files is cyan
- import/export includes and notice files is cyan
- bootimage/recoveryimage is cyan
- and some more colors in many places ;)

Change-Id: I5532afa4ba608e0a7c408516dc9f912f9ca389f7
Merge remote-tracking branch 'cm/jellybean' into jellybean

Conflicts:
	core/Makefile
build: fix ccache usage when building kernels

Change-Id: Id4edd4d85d9ba3ef42575f5fdebf22ed14957a99
Inital Fork
Revert "Changes caused by tile changes"

This reverts commit 54e3cfcdd52bb2c7fb52c28b98ab7c9e6209d29f.

Conflicts:

	public/game.js
	public/player.js
Revert "Some logic changes for light switching of the ambulance"

This reverts commit 8f681f31856bfcc5f81f4adc5cc322f9f8024b91.

Conflicts:

	public/game.js
	public/player.js
Fix lighting angles
added command-t, vim-rails, vim-ruby
our vim-ruby
Use -t for move-window with -r rather than dying. Reported by Ben
Boeckel and Thomas Adam.
Finished first block of replies
Added the error replies
Added final replies and errors
improve NativeQueryInfo + workaround for native count
Almost finished social + makefile
Oso golpea y regresa a su posicion
Created gh-pages branch via GitHub
Merge branch 'gh-pages' of github.com:Trott/LightningTouch into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages'
Update README.md
Merge pull request #5 from Trott/master

README and demo updates
Merge pull request #6 from Trott/gh-pages

README and demo updates
rm cruft
Merge branch 'master' into gh-pages
Some progress
Changed .gitignore to ignore unit test output files
Code guidelines v1.
Bredd på article
Hacks that get ./pants idea to work
fix add Slim_MageArcaneBar
Ref #3018 : Box report queries
Instasll tmux
Make the tmux status-bg yellow while tests are running
Updated BPF
Fix Checkstyle, PMD and Findbugs warnings.
Fix Javadoc warnings.
debugging jetty
插入图片功能完成，功能暂时不上，等需要的接口调试上线后在增加
修复目录(标签)过长导致左侧列表可以水平滚动的bug
修复一些bug

1、修复编辑文档再保存，会新建一个全新的文档的bug
2、修复编辑和新建混乱的bug
3、暂时隐藏插入图片功能
4、将部分代码分离，事件绑定函数中不处理业务
Added log level to config. Not built yet, and not tested.

Signed-off-by: Wolf480pl <wolf480@interia.pl>
added translation for Articles

Signed-off-by: NurPech <nurpech@nurpech.de>
added category suggestions

Signed-off-by: NurPech <nurpech@nurpech.de>
Merge branch 'master' of https://github.com/WoltNet/WoltNet-Wiki.git
added language Variables
Edited JMSSecurityExtraBundle doc link

It now points to the real documentation of this bundle and the version used in Symfony2.0, which is 1.0.
Added function_node, not done.
重新整理
删除多余文件
comment out new method

should be working
added more condition to .gitignore.
Funcionando ordenar en clientes juridicos
Columnas ordenables en clientes juridicos
second commit
removed redundant reference to text
Merge pull request #3 from Zilvermoon/master

Added: "wt_core_state:remove( kelement )"
- fixed hp nil checks
Merge pull request #4 from HansW2012/master

fixed hp == nil bug
removed settings.lua
fixed gw2minion gui update lag
Merge pull request #5 from HansW2012/master

fixes
Merge pull request #1 from MMOMinion/master

Update
Added a vc2010 project with instructions

I got tired of converting the old 2008 project each time I've tried to
compile this project. Added a readme file to get a new user up to pace with
the dependency of the freetype library.

There were some mismatch issues with the output filenames after the
conversion, which is all fixed.

The freetype[v]MT.lib is replaced with freetype[v].lib. MT is for
multi-threaded non-dll projects, and the latter is for multi-threaded dll
projects. This is the better choice since LibRocket is a dll project. Mixing
runtimes is bad mojo which can lead to subtle and hard to find bugs. Better
safe than sorry.

Also took the chance of upgrading the freetype library to v2.4.10. The
readme states which options to change in order to alter the desired version,
so its a quick fix for new and old users.

The new project is in its own directory in the build folder. All paths have
been updated for this and should work as expected. The support folder is
still in the paths and is also updated.

All final output files end up in the rep_root/bin folder. Debug versions
appended with '_d'.
Buffering added to temp file read/write
Added list view for events. Changed server port from 4567 to 5678 to allow concurrent running of course example on the same machine.
Adds tour seed data
Erreur d'ajout de commande quand le médicament n'existe pas
do not use risklib.Curve to describe Hazard Curves
Merge pull request #8 from matley/refactoring

do not use risklib.Curve to describe Hazard Curves
Add debug options to parser
Update word count.
Corect BAT processing.
Integracion administrador de usuario
Hide text for favorite icon in autocomplete results. fixes #38
Merge pull request #38 from WizardOfOgz/master

Text should not be shown in search results primary icon
jsonp support to the pipeline read
Merge remote-tracking branch 'lholmquist/jsonp'
Pipeline:Rest - Fix query test and limited data mock
Changed name of repostitory.
Wrote documentations for com.agileapes.powerpack.reflection.conversion.*
WIP on refactoring of FlexoController/FlexoMainPane/FlexoFrame
MEDIUM: Removed unnecessary typing of FIBController
LOW / Fixed no more compiling developper's tests
Intermediary commit
Merge branch '1.5' into ontologies_abstraction

Conflicts:
	flexodesktop/modules/flexovieweditor/src/dev/java/org/openflexo/ve/fib/dialogs/DeleteOntologyObjectsDialogEDITOR.java
reverted process selector temporarily
LOW:Fixed automatic update of the RC for server
Localisation, Listes
modified:   rsc/scripts/apply_unwarp.sh
 	modified:   rsc/scripts/eddy_correct.sh
 	modified:   rsc/scripts/feat_unwarp.sh
 	modified:   rsc/scripts/main.sh
 	modified:   rsc/scripts/topup.sh
Improved user vote page.
Site updated at 2012-05-11 20:07:48 +0800
Use the correct database name when writing to database.
Semicolons are now used to mark the end of a Cypher query
The shell now treats CREATE as the start of a query
Merge branch 'master' of github.com:neo4j/community
Moved GC resistent cache to enterprise and made cache implementations pluggable via Service loader
Follows name change
Merge branch 'master' into gcr-in-enterprise-as-service

Conflicts:
	kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java
	kernel/src/main/java/org/neo4j/kernel/impl/core/NodeManager.java
Attempt to fix windows problems with unclosed messages.log
Fixed closing of messages.log for real
Allows for supplying a filter in XaLogicalLog#applyCommittedTransaction so that the transaction can be chosen to not be applied once it has read the entries and looked at it
Merge branch 'master' into gcr-in-enterprise-as-service

Conflicts:
	kernel/src/main/java/org/neo4j/kernel/AbstractGraphDatabase.java
Merge pull request #392 from tinwelint/gcr-in-enterprise-as-service

Moved GC resistent cache to enterprise and made cache implementations
Circumvents a javac bug
Merge branch 'master' into dont-apply-txs-by-me
Merge pull request #393 from tinwelint/dont-apply-txs-by-me

Allows for supplying a filter in XaLogicalLog#applyCommittedTransaction ...
Revert "adding UTF-8 to tests for testing unicode stuff properly"

This reverts commit a96e427d0b51647681277a378fb69babfb2f39a1.
Revert "Modified batch operations API UTF-8 test."

This reverts commit 35205d564a6b72fa4f57e2b667faa88e4681372f.
Merge pull request #394 from nawroth/revert-utf8

Revert UTF-8 related changes
Revert "Allows for supplying a filter in XaLogicalLog#applyCommittedTransaction so that the transaction can be chosen to not be applied once it has read the entries and looked at it"

This reverts commit 591091e80f88d4f1dcd4387a60b2f8c33dd3ebe8.
Merge branch 'master' of github.com:neo4j/community
Revert "Merge branch 'master' of github.com:neo4j/community"

This reverts commit e9b7443304e12d35997f4d979d05e3cf9afae629, reversing
changes made to 23346cd77de055de58b607452f090ffac2fc9782.
Updated changes.txt
Initial configuration

Config for tmux, oh-my-zsh, bash, ack, vim, LaTeX, and git. Installed
a number of vim bundles:

* syntax highlighting for git, jinja2 and {less};
* powerline;
* solarized color scheme;
* pydoc;
* ctrlP;
* ack;
* numbers;
* nerdcommenter;
* syntastic;
* gundo;
* dwm; and finally,
* repeat, surround, and unimpaired.
Added basic menu system. Some basic buttons

I also added preliminary (and kinda corny) logo and buttons...
They need a lot of work
send frames to server
Trying to get free member functions to work
Adding the cart and the line_items. Line_items will hold the relation between a product and the cart
Section on how to install.
fixed bug in multiple shared namespaces
Characters move around a little differently.