labofsahil/github-event-dataset-2012 huggingface dataset:
realized i can't do 0.0.11
add dependency when compile .0 file
Added message area, looking for secgoats help
stop bundling libraries
fix catch func reference
fix bug (not throw a exception when fin() exists.)
Maximum number of pages/files cannot be exceeded independent of the
number of synchronously running threads
fix error on tDiary 3.1. #37
add a comment about obsolete. #37
fixing plurarl exchange repository name
test commit
rename, remove old
update
Fix of images

Signed-off-by: curtis <cs@techeyes.com>
Addition of CSS for Fast Pass

Signed-off-by: curtis <cs@techeyes.com>
added: OAuth authenticate method for web application callback
add support for `lein :connect [hostname:]port`
echo port number of headless nREPL server
Don't stomp existing :exclusions when pulling in dev-dependencies.
don't propagate DRIP_INIT or DRIP_INIT_CLASS to subprocess
Add db definition and data
fix getAccountByMobile
finish find eulerian tour
eclipse again and again
Fix the Manifest sdk for 3
improved colorized
Fixed the player completely. No longer rely we on foldalbumd. Need to end the progress bar and add lyrics; after that we should be finally done with this whole thing.
Write unit test scripts
fix bug in ccc/person.rb
add rails-footnotes
don't die just because fb update failed
Merge branch 'good'

Conflicts:
	Gemfile
	app/models/answer.rb
Merge branch 'MH-354' of https://github.com/thelabtech/missionhub into MH-354
Removed the 'missionhub_dev' symbols in a Person scope
Merge branch 'MH-354' of https://github.com/thelabtech/missionhub into dev
fix CurslorLineNr highlighting
fix snippet
set basename
Add/remove a few plugins.
cm: Add prebuilt Superuser APK

 * Temporary until Superuser is fixed to build with the platform.

Change-Id: Ic1dc48a461eb0142e2c2dc9bd4012e1bc5f969e1
Merge "cm: Add prebuilt Superuser APK" into jellybean
remove mount/unmount capabilities from backuptool

backuptool should not be messing with whether /system is mounted
or not as it screws up the expectations of other scripts run
in the install process. instead the mounting/unmounting
functionality has been moved to ota_from_target_files

Change-Id: I0711afd517638e7d0a0c39369d3a776748245dd2
Merge remote-tracking branch 'upstream/jellybean' into jellybean

Conflicts:
	config/common.mk

Change-Id: I29831e68695f5d0cade40d5c6124b5b7980cd1de
added given scripts
Merge branch 'master' of github.com:tianyupu/comp3109ass3
Added Compass
Added symfony-plugin so we have autocomplete on the app/console part
Editoriparannuksia
shape: Open input file in binary mode for binary STL.

Fixes binary STL loading on Windows.
Adapted Q31-Q34 for new join
Fixed bug in ArithmeticOperator.ccp
slides
!
New Textfile
Added textfile.
Added some changes.
Implements the first lines of the player.

  - gui dirs created
  - simple widget gui created for testing
Removed old way of checking for byte order (appeared to be multiply redundant in confusing ways, new way seems to work).
Added support for SEEK_END.
readBytes no longer returns NULL on a bad read, but does still report an error.
Destructor checks if the file is closed before attempting to close.
close() reports if it is called on a closed file.
close() ensures files are the correct length before closing.
Refactored y-code to be cached
No longer includes import.rb...
Removed import.rb.... I'm a moron
Hook the undefined value
css editor syntax highlighting: fixes #7
Fixed slow location dumping.
added test for cursor activity to ParsingCodeMirror tests
api.coffee is just raw javascript because of firefox/coffee requirements
more little changes
More little changes
Fix failing tests related to selection field changes
Conform with formencode - http://bit.ly/KDpyra.
h2 database lib update 1.3.168
Almost to beta
trying to fix the dropbox debacle-too many changes to count
Adapt to ruby 1.9.2 changes
Removed "copyrighted sh*t"
bumped troopjs
Don't need to require json
don't double wrap item during add

store returns null, not undefined
Store the customer email when subscribing
Add module to manage and export customer email
first commit of migration changes
Location migration files added.  These files migrate but have not been
proofed.:w
:w
:q
Merge branch 'master' of https://github.com/tunacasserole/horizon

Conflicts:
	vendor/gems/horizon/db/migrate/201209020000001_create_companies.rb
product migrations
customer order migrations
Update Biomes and WorldChunkMgr
added flatiron json function
Quick Fix For Versions
add develop.txt in develop branch
add helloworld.txt
update helloworld.txt
update helloworld.txt with third line
Merge branch 'feature/hello-world' into develop
Applied Ed Merks's better workaround for the EContentAdapter bug #227
QueryExplorer instance null check added to non-ui accesses #288
only lower case pattern names are allowed in eiq file wizard #56
Modified codegen validator to use the same package as the patterns
Better fix for NullPointerException when inserting a host that is down.
Added Better parsing , edited Executable name, fixed TextFile busy Bug while saving binary to internal memory
Added Control spaces for type casts.

Added more tests.

White space removed before cast - FIXED.

Supported multiple casts in same line.

Make code more readable.

Make code more readable.

Fixed cast at the end of the line bug.

Fixed cast at the end of the line bug.
removed unnecessary info from logcat appenger
CLOSED - task 3: Add RoboGuice to project 
http://github.com/unchiujar/sleepcycles/issues/issue/3
Merge branch 'release/unicorn-2.6.8' into develop
Change requirement of vm-vsn
Update default-config
Fix a launch-related bug
Refactor
Fix a luanch bug
Change version
Merge branch 'release/unicorn-2.6.9'
Added lintswitch plugin; some vimrc changes
Added Type + Worked on HeaderWriter
Fixing indentation issues, and adding comments
Cleaning up branches
Removing one last HEAD
HeaderWriter changes, see email for notes
Fleshed out HeaderWriter + added out.cc and out.h to testfiles/
Fleshed out HeaderWriter some more + moved testfiles around
deleted duplicate test files
fixed tabs in HeaderWriter
fixed indentation in QimppTranslator
Minor fixes to HeaderWriter
generated javadocs + simple makejavadocs script
Added InheritanceTreeManager (incomplete)

InheritanceTreeManager maintains a data structure with all defined
classes and their methods, so that we can get an ordered list of the
inheritance hierarchy for any object for InheritanceManager, and
all necessary methods and fields can be included. It is incomplete.

Also added: InheritanceTreeManagerTest and SimpleTest (a reference test
from junit)
Changed permissions so editors can see insights page.
Clean up the code for view used by the main page controller

* The indentation and bracketing in the view file was all jerked up
making the code unreadable. For reference on the coding standards used
in the platform, see
http://wiki.ushahidi.com/display/WIKI/Coding+Style+Guide
Overlay KMLs on main map

* The KML listed on the sidebar ("other layers") can now be overlaid on
the map. This feature has always been there though previously, the name
of the layer that was displayed on the layer switcher control was not
the same as the name of the selected layer. This has now been rectified.

* Added an extra event 'delete layer' in ushahidi.js which triggers
removal of a layer from the map. This event is registered as soon as
the map is initialized so that when invoked, the 'trigger' method does
not exit prematurely - what happens when an event is not found in the
callbacks registry. The name of the layer to be deleted is the second
parameter when calling the 'trigger' method

* Coding style updates for the layer method in the json controller
Closes #611. Fix sharing plugin to work with Ushahidi.js. Thanks @ekala
Closes #658 . File referencing error fixed.
Related to #611 based on changes to functions in json controller.
Closes #692

Signed-off-by: Linda Kamau <kamaulynder@gmail.com>
Merge branch 'v2.5b' of https://github.com/ushahidi/Ushahidi_Web into develop
Merge branch 'develop' of https://github.com/ushahidi/Ushahidi_Web into develop
Revert "Optimize has_permissions check to only check superadmin access once"

This reverts commit 60e3a4b9f5f48d3bdde23dc16950f48823e33cfc.
Related to #948
Safer optimization for User_Model::has_permission() #948

* Avoids breaking tests
* Just caches the repeated query, not the permission check
moved RASDemo to a projects folder
mudancas na capa, sumario e trabalho final
bb
Fix varnishncsa memory leaks on duplicate headers
stty tostop: stop bg processes which try to write to stdout
Gui for naming factions works, also does adding Serfs to factions.
unique id gets generated using state based equality now
Add basic student template
Add jordansissel stuff
shaping collection hierarchy structure
Fixed typo in John's bio. "aslo" to "also"
added Book object with three NSString properties
added sample book via createBookList method to our bookData array
added 3 labels to display bookData array
added displayBookList method which *should* display the retrieved values from the bookData array.

The Problem: it doesn't work - the array seems to be empty.
The Question: what am I doing wrong?
commit inicarl del proyecto
Merge branch 'master' of github.com:victormfv/curso_rails

Conflicts:
	.gitignore
BUG 0000 Adjustment in te class classtaskExtendedPropertyTest.php

-  phpunit and phpcs tested in the class classtaskExtendedPropertyTest.php
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
BUG 0000 Adjustment in te class classdashboardPageTest.php

- phpunit and phpcs tested in the class classdashboardPageTest.php
phpunit classApplicationWithoutDelegationRecordsExceptionTest.php

- Initializing.
- Standard code.
phpunit classInvalidIndexSearchTextExceptionTest.php

- Initializing.
- Standard code.
Merge pull request #258 from hector-cortez/master

BUG 0000 Adjustment in te class classdashboardPageTest.php
Merge pull request #259 from marcoAntonioNina/master

phpunit classApplicationWithoutDelegationRecordsExceptionTest.php
Merge pull request #260 from victorsl/master

BUG 0000 "PHPUNIT instantiation classXmlForm_Field_toolButtonTest.php" SOLVED
BUG 0000 "PHPUNIT instantiation classXmlForm_Field_popupOptionTest.php" SOLVED

- Instantiation of the class
- Formatting file to PSR2
better view in console
fixed the display of classes
adds geocoding to signature: https://app.asana.com/0/757365029395/1708270137125
Merge branch 'master' of github.com:victorykit/victorykit
add email experiment with box containing picture, summary, and button on top vs. on right
Added experiment to dynamically change sign-petition-link font size
Fixed email scheduled test by including stub
updated facebook_popup spec for capybara; doesn't run yet without some config shenanigans
Merge branch 'master' of http://github.com/victorykit/victorykit
Merge branch 'master' of github.com:victorykit/victorykit
geolocation - https://app.asana.com/0/1328982439263/1708270137125
modify font size experiment for email link to use percentages rather than fixed px values
Merge branch 'master' into submit_signature_via_ajax
AJAX call to signed petition yields back member data for first-name placement purposes. Fixed thanksModal test failure.
request spec for sign again stuff
added hierarchy of Hashers
Changes in the message.
Added usage statement for word_extractor.py.
tech + control
tech + control
eikona arxikh mege8os
added task info to xls export

fixed issue on taskdetect for gapstop
Update the error logging to use getDisplayName for better portability.
Add Windows Service capability
Merge pull request #6 from fredericBregier/master

Add Windows Service capability
update LoggingMiddleware
fix toplevel new expression
Merge remote branch 'shida/merge'
set $PRESENT properly for 64-bit machines
MongoDB: Students
added my crappy cgi script lol
fixed kernel source URL
README: howto cherry pick from forked repository
Fixed a bug in serializing the player name
Changed how template path resolution works. /foo will now load the foo
template from the root template group and /foo/ will load the index
template from the foo group.
Settings tab on Templates screen now hides some fields when toggling the
Is Private? radio buttons. This is because some fields (such as Cache
timeout) is irrelevant to private templates.
Cache timeout is no longer a required field.
Include all objects in "wt list" by default, so LSM trees appear.
Fix the maximum size of the bulk-loaded bitmap chunks from the Bloom filter code.
Salvage calls snapshot-load with a NULL WT_ITEM, it doesn't want anything
back.
Adding a second template
Merge branch 'working'
Merge branch 'working'
fix registered name of elli_access_log_server
pass-along all remaining config options to syslog:multi_send/2

also set the sender's hostname to inet:gethostname/0 by default
No longer needed
Upgrade old rates to new structure
uninstall new tax tables
install tax tables
prevent notices
Tweak tax display - zeros option removed
prevent notices
Save new tab tables
Importer and sample CSV
Fix checkbox export
New find_rates
Split up scripts. #1575.
Split review items from total

This change give the user more control and makes the page better for mobile sites. An example can be seen here.
https://www.shultzilla.com/checkout/
Merge pull request #1992 from grappler/patch-2

Split review items from total
Upgrade to Atmosphere 0.9.3
files
Merge branch 'master' of github.com:wrgill999/BeraRentals
big restructuring. Using base32 instead of base62.
replace base template
add top 5 referers to index, shortlink to list-view
Merge branch 'master' of github.com:sbaechler/url-shortener

Conflicts:
	shortener/views.py
add perms for views
update templates, add referers to info view
add click graph to detail view
remove flot examples and jquery
Merge git://github.com/sbaechler/url-shortener

Conflicts:
	shortener/admin.py
	shortener/models.py
	shortener/templates/404.html
	shortener/templates/base.html
	shortener/templates/shortener/index.html
	shortener/templates/shortener/link_info.html
	shortener/templates/shortener/submit_failed.html
	shortener/tests.py
	shortener/urls.py
	shortener/views.py
	templates/base.html
	urlweb/templates/base.html
	urlweb/templates/shortener/index.html
	urlweb/urls.py

MAY NOT WOKING NOW
Updated version number for release 1.05
Fixed merge conflicts on version number
Merge pull request #42 from iainrb/devel

Merge changes from iainrb/devel for version 1.07
move css from swordpushweb into this plugin.
working autocomplete? can't find any bugs through testing so far
working autocomplete? can't find any bugs through testing so far
test if cached
fix refcount, magic and etc.
changes
add test case to use cache on fork (nihen)

https://gist.github.com/3890412
cleanup tests
cleanup logs
Create simple instance

simple instance
fixing the package and added to pips
If an image URL is local, don't bother copying it.  If the image URL is a local directory, don't try to untar it.
Merge pull request #231 from timjr/local-images

If an image URL is local, don't bother copying it.  If the image URL is ...
added why-sign-up links
exctract redis populator to a separate class
new test files, copy from other places
Update yavdr-essential

added missing dependency
Changes from US of A
Updated GUI with threading
Automated commit on Sun Apr 15 09:46:27     2012
db:seed to create a site that matches all the URIs
Add files

add files
Fix build errors with autotools, fix a couple of grave bugs
0000742: Draft grid
Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad
fixed incorrect static prefix
Updated CFBundleVersion to 1.2.1
friends of friends
crawl by text&friends with script / unnecessary prints removed
update frontend translation for zabbix-2.0 trunk
untracked index database and core
Stylize for widgets
Bug in header
Begin adding repo name logic

Lazy method of getting fancy repo name - I do everything in ~/src.
Therefore, any subdirectory of ~/src must be SOMETHING srcwise
I actually care about seeing.  Therefore, use that subdirectory
to fill a new field in the prompt, to supplant CWD.
Finished initial version of repoprompt logic
too many zeros
updated README
updated example templates and modified steps
removed junk, cleaned up some whitespaces, merged in a few small changes and most importantly removed jeweler and fixed gem spec.
Tweaked parse error reporting code to show intended lines - it was omitting the line before the error line.

git-svn-id: https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk@4761 dbd5520b-6a0a-0410-a553-f54834df5b05
-Fixed crash by checking parameters to MultiTurnProgressBar. Some calling code is probably still not doing the right thing, though, which was leading to the crash when enqueueing buildings with very low costs.
-grooming

git-svn-id: https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk@4762 dbd5520b-6a0a-0410-a553-f54834df5b05
Tweaked BuildingIndicator constructor to remove unnecessary parameter.

git-svn-id: https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk@4763 dbd5520b-6a0a-0410-a553-f54834df5b05
-Removed system graph initialization from universe deserialization, and did it separately in calling code.
-Added system graph initialization to turn processing after effects execution, to hopefully fix issues with AddStarlanes and RemoveStarlanes effects.
-grooming

git-svn-id: https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk@4764 dbd5520b-6a0a-0410-a553-f54834df5b05
Merge remote-tracking branch 'svn-mirror/master'
Fixes in classification and hit details sites.
License added
License added
Merge branch 'master' of https://github.com/1UnitedPower/thread.js.git
add -webkit ,......
add [data-tooltip] bur not complete
change direction => rtl [persian]
donate process improved
Merge branch 'master' of github.com:3advance/ClimateCounts
@3oheme starting with a google chrome extension example
add competition court football team
add therubyracer to gemfile
done with authentication
add newlines to the end of some files
delete debug methods
delete static_pages, add TB makeup
change Readme
changed Readme
before sleep commit
before sending commit
Adjusted configuration objects to allow cross-domain comunication
Created first pipeline item
allow filtering by user

click on the user to filter, click to remove
libgui: Add ICS/MR0-compatible client::createSurface constructors

Change-Id: Ia5b04d93320c65ac32a92cbd93daa6a64e6cee1c
Update notes for submitted changes

* Added option to show full datetime for messages
track d2vzw

Signed-off-by: BMc08GT <bmc08gt.teamb00sted@gmail.com>

Conflicts:

	default.xml

Change-Id: Iac2436ce500038dc1ac3ad64803662346bdfca2b
Add table to dashbord
Further tailoring of dashboard
More dashboard customisation
Vote buttons added to dash
Dash legend color sorted
Fixed word-wrap on groupname
Fixxed failing spec
remove unwanted files
fix voting bug
Conditional creation of object directory.
Merge branch 'master' of https://github.com/AdaHeads/openid-client
Багфиксы на сегодня - 2
Меняю парсер - часть 1
Commented out an unused packetid

In the process of documenting the login protocol on the wiki, I found
out that the client was registering a packetid that is no longer being
used.
Refactor of utilities.

Author: Aleksandr Shulman <aleks@cloudera.com>
Date:   Sunday, October 28th, 2012. 3:50 PM PT.
h
h
d
asdfasdf
random commit
asdf
testing
blah
message
asdf
fix
disable exceptionoutput.ads
exceptionouput disabled
Various minor clarifications in README.md
Bug with with ACTION_OUTSIDE has been fixed
Move and Zoom bounds for camera has been implemented
Example configuration file and file license
Improvements to menu gestures
Added a style for the GestureMenuItem to mimic that of the MenuItem.
Fixed some mismatch of the command line parameter names and internal 'task' identifiers.
Modified README.md to create conflict
Merge branch 'T3'

Fixed the conflict in README.md from merging T3 into Master
- This conflict is deliberate to show conflict resolution and commit

Conflicts:
	README.md
page makeup && hot-fix
-u
renamed file
Cloned files.
Page téléchargement des apps
Suppression cadre gris sur les boutons reseaux sociaux dans le header
FIXED: bug with execfile
Correct case of iebox
Fixed MC version inside version command.
Added in a super awful hack to get this to work
Правка плагинов
Плагин Регистрации и Авторизации
Плагин Багтрекер
linux-bede :: 3.6.8rc1-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
libaacs-git :: 20120420-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
libbluray-git :: 20120420-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
python2-pymongo-git :: 20120420-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
xbmc-git :: 20120421-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
Creando interface de tweets
Merge branch 'master' of https://github.com/BootcampHTML5/Equipo-3.git
fix
fix2
fix
Update native function test
Alfred Denis Cortot
Added charset to layout.slim
inital dabble with requests
Removed dead code
Merge branch 'master' of https://zachberger@github.com/ChadSki/se441_project1.git
separated generating algorithm part from mapping part
Changed guitorelative coordinate system calculator to use an interface instead of concrete gui type for reuse
Added relative mouse coordinates to MouseInputProcessor
Changed opentkcamera to only use mouse input processor
Code cleanup
Use multidictionary in mouseinput processor instead
removed base tag from template.php
Move repl startup into the core/start function, untested, but should work.
[cli] This should work for processing bzr requests.
remove generated titlepage for units/part|first-child
Rename app_key -> app_data_id.
Added a getResponseCode(String)
First commit for TranslationManager
Removed IP Address

Test
I imported the plane and I am trying to add it a grass texture...
Added initial policy files.
Merge branch 'master' into policies
Implemented policy lexer and parser grammar.
Merge branch 'master' into policies
Implemented parsing and execution for linker policies.
Fixed memory leaks in libdcpu-ld-policy.

Removed empty policyast.c file.
Finished implementation of linker policies.

Updated linker to use linker policies.
Updated CMakeLists.txt to not put kernel policies through configure_file
Updated assembler to create intermediate code by default.
Updated policy lexer to permit '-' character in setting names.
Updated linker API documentation.
Added --no-intermediate option to disable intermediate code.
Added TOOLCHAIN_STDLIB and TOOLCHAIN_KERNELS environment variables.
Added userdata to policy execution state.
Added policies_get_setting function.
Added new error codes as needed.
Fixes for emulator.

Changed --no-intermediate option to --binary.
Improved emulator error when loading intermediate code.
Fixed emulator check for intermediate code.
Fixed emulator crash due to not using dsethalt.
Merge branch 'policies'
Changed the argument order as per DCPU 1.2 spec
Refactored the clock device
Merge branch 'master' into mac
Dropped support for Emscripten.
Updated troubleshooting for config under Cygwin.
Updated buildbot link on README
add functions to radiative transfer
function in tools/ take arguments
pbrt takes samples non isotropic
Noff2Pbrt for non isotropic samples
add volSubSample
Cmake added and code indent
removing files
pbrt original + pbrt photon all in one
scale values in noff2pbrt
change README to actual version
scale parameter to image in Noff2Pbrt
help message in volSubSample
add volSubSample in README
scale parameter in Noff2Pbrt for image
remove files
change photonmap~
change photonmap.cpp~
change distant.cpp~
remove distant.cpp~
Merge pull request #1 from richard63/master

Adding tools and custom pbrt files for radiative analysis of snow samples
finished up to 5.1.3 Partials
Contenido web

Agregado y modificado contenidos.
Data is now extracted from text file. Need to implement Database now
Pass wrapper for GraphicsDevice to Draw methods

Created a wrapper for the GraphicsDevice (used to draw some primitive
stuff) to the draw method. So we ask the object to 'draw yourself, and
here is the graphics device to use'.
This means we don't need to inject GraphicsDeviceManager into
GameObjects via constructors, and simplifies testing the draw methods
(cause we just pass in a mocked out IGraphicsDevice)
close to working version of the RBM code
Merge branch 'master' of github.com:DavidEscott/ML_Project into yelin

Conflicts:
	matlab/test_process_rbm.m
	prepare_files.m
Fix to http://jira.diamond.ac.uk/browse/DAWNSCI-93
extra marks
gui changed
parser created, gui separated from main class
Fix: Maven error in Jenkins
Added package file for nom
replaced optimist with commander module as we'll need it later
added directory deletion confirmation
added license and started preparing for binary release
ready for binary release
Merge branch 'feature/npm-module' into develop
Merge branch 'release/0.0.10'
Core/DataStores: Add comments which dbc not more exists.
внешняя рамка для меню закончена
Refactor rename shared_user to SharedUser

Signed-off-by: EMayej <pd4ever@gmail.com>
Parsing now reads and recognises if lines
add domain settingpost
first work on EndReset
Merge branch 'develop' into feature/thebeginningoftheend

Conflicts:
	src/main/java/net/escapecraft/escapePlug/EscapePlug.java
more work on EndReset

- add persistance
- add commands
- add Dragon Death broadcast
fix indent
Merge pull request #50 from hydrox/feature/thebeginningoftheend

Feature/thebeginningoftheend
login和register部分修改
Implemented basic HTTP Response parser
Implemented a simple header representation
Added support for HTTP status codes and messages
Moved some things to internal method setPathFromURI()
Re-wrote the whole client ...
Renamed HTTPClient to Client
Replace Error notification with exception for Tags model
Autodetect lua5.1 (not sure how to detect lua-5.1 or just lua)
Rectangle snapping.
inserted some comments and did some embelishments
fflush(stdout) => fl(). Corretti alcuni dettagli del log del server.
Riordino dei campi di client_node.
cleanup
Fix overriding
indentation
Remove unnecessary indirect call
WEOIUR
Use Mizuho to generate documentation instead of Asciidoc.
Correctly generate documentation files
Merge branch 'master' into experimental

Conflicts:
	lib/phusion_passenger/standalone/runtime_installer.rb
Ajout Interpreteur+console
Ajout interpreteur
added non-numeric prefix to friendly ids and mapped bike or hook searches at the top level uri
added non-numeric prefix to friendly id
add one line
Merge pull request #1 from Further077/shell

add one line to merge
Test app updated.
updated mysql to separate database info
Add documentation version 2.4.2 to the GnuCash website

git-svn-id: svn+ssh://svn.gnucash.org/repo/htdocs/trunk@22571 57a11ea4-9604-0410-9ed3-97b8803252fd
Enable epub and mobi downloads for stable series

git-svn-id: svn+ssh://svn.gnucash.org/repo/htdocs/trunk@22572 57a11ea4-9604-0410-9ed3-97b8803252fd
initializers/omniauth: fix config loading.
added support for multiple template roots
WIP:  Mac changes
AUTO-391 Add New Post Page: The G icon to add a video should have ALT or rollover text that reads Insert Video
Merge branch 'integration' into dev-cs
Versioning
AUTO-389 Catalog: Preview Feed label on the page should read Search Videos as defined in the UI spec
AUTO-393 PHP warnings in log file: gp-catalog-template.php on line 115
Catalog: bug fixed, Categories were not urlencoded
fixed regression for url encoding of catalog urls
AUTO-381 Google syntax is incorrect
AUTO-381 FIX Google syntax is incorrect
AUTO-398 Catalog Page should not show any video results when you enter the page for the first time
POC catalog refactors
Catalog: search results limited
styling
Fixed conflicts
Updated versioning
Workaround for wordpress bull  w/thickbox.  correctly inserts. search and styling pending
AUTO-402 Catalog: Help info must be updated following the parameters indicated in AUTO-381
Merge branch 'integration' into dev-cs

Conflicts:
	src/includes/gp-catalog-template.php
AUTO-295 REGRESSION
AUTO-404 Clicking on the search button, after clicking on create feed, takes user to the create feed page
Extend kinetic rate evaluation to allow for user chosen P as well as T.

Added kinetic rate evaluation for plotting app.  App has some
simultaneous usage danger that is currently ignored.
Added glMapBufferRange
Merge branch '4.2.0' of ssh://g-truc.git.sourceforge.net/gitroot/ogl-samples/ogl-samples into 4.2.0
Fixed CMake project
More pipeline objects
updated ogl-420-image-unpack
- moved creation of timer to connect function to prevent continuously creation of timers
another temporary push
ドキュメント周りの追加
ドキュメント周りの追加
update method
conflict
app.js ei toimi
vanha rendaus
piirtäminen toimii /view polussa
Fixed some mistakes in tutorial. Moved downloads locations.
jGrowl engaged, private function _msg(msg, life)
ClientUnderTestInterface
removed some warnings
adding commondata to client classpath
RMIonlyClientSystem
Added a new checkbox to the UI to control whether build variables are passed to
MSBuild as properties (default true = behaves as currently). If unchecked, said
variables won't be passed to MSBuild.
Shields explode when they die.
baked supplier code
adding basic code for figuring out the product code
adding slug to options and product_code to option values to build product codes dynamically
fixing up the code to figure out the various product codes
fixing up the code to build all available product options
New Features!

The add new task input field is auto selected when the page load ANd
when a task is clicked

Prettified the ASCII tree
1.update GM_script
Github 저장소 테스트.
다른 테스
Alterando as classes GZMigration, SQLDataProvider, SQLDataProviderImpl,
MigrationEngine e IMigrationResults para adaptar ao novo jeito de obter
os dados. Foram feitos testes de migração de PRODUTOS e obtiveram
sucesso, o próximo passo agora é adaptar os outros tipos de dados e em
seguida reconstruir o relatório. Também foi incluído uma nova opção na
tela de escoha dos tipos de dados da migração que possibilita o usuário
ignorar ou não os códigos de loja no arquivo de dados de produtos.
Added todo note to set up autoloader
Always use Document passed in with event
added a commented csrf tag in application.html.erb
added entry for piratenkampf
Removed unnecessary test, updated broken test, fixed broken paths.
updated readme, optimized import/export
wakelock: (tungstwenty's implementation) plus lots of other additions
(cherry picked from commit 486ed18fb8c3c4fe393253dce1e0d2a2a89ca196)
wakelock: (tungstwenty's implementation) plus lots of other additions PART #2
(cherry picked from commit 2387398702fd3c3f61e3220a2b98a7854755bc7f)
Update About Us copy

[close #35]
process_1
add STREAM_FM
fm volume (by maniac103)

Conflicts:

	core/java/android/view/VolumePanel.java
	media/java/android/media/AudioService.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
config_fmSeparateVolumeControl >> false by default
 add bootmenu
Dynamic dealing with missing GL_OES_EGL_image_external extension

- instead of static replacement of GL_TEXTURE_EXTERNAL_OES with GL_TEXTURE_2D
and patching the platform code at various places, use gl library call hooks
and shader source filtering at runtime to achieve the compatibility
also with apps compiled outside of the platform (e.g. Opera Mobile)

Change-Id: If995753e3e1fdc2cbc895a74537396f193f31115
Removed an unnecessary 20px lower margin.
This'll make the top edge of the buttons overlap with the scrollbar, which looks kinda neat.
bugfix
Merge branch 'master' of github.com:KohoVolit/KohoVolitAPI
Nomes
Merge pull request #91 from Maldonny/patch-77

Nomes
removed unused function
ARC patch
Merge remote-tracking branch 'refs/remotes/slembcke/ARC' into gles20

Conflicts:
	cocos2d/Platforms/iOS/CCDirectorIOS.h
ARC improved changes
Removed compiler warning in ARC mode
ARC improved changes
Conflicts:

	cocos2d/ccMacros.h
Updated Changelog
Merge branch 'refs/heads/develop' into gles20

Conflicts:
	cocos2d/ccMacros.h
Added support for Milliseconds per frame
Updated CHANGELog
Templates use the correct API
Modify CCLabelBMFont to provide: Left, Center, and Right alignments. Auto word wrap based on given width. Based on https://github.com/pingpongboss/CCLabelBMFontMultiline
Use CCTextAlignment instead of UITextAlignment
Fixed cache problem with textures. Thanks Nicolas Gramlich
No more using removeAllChildren
git rid of warnings
Merge remote-tracking branch 'refs/remotes/pingpongboss/develop' into gles20

Conflicts:
	cocos2d/CCLabelBMFont.m
Missing resources from PingPongBoss alignment sample
Merge remote-tracking branch 'refs/remotes/pingpongboss/develop' into gles20

Conflicts:
	cocos2d/CCLabelBMFont.m
LabelTest compiles and works on Mac
Check if we are already in the zone for traveling steps.
First half of Dread Wastes play test.
created Localstorage mock
update createDeps

* add test dir to depsWriter
* new deps file
refactor createKey_

* changed to @protected
* renamed to createKey
added remove and clear expired values functionality

* fixed constructor bug
* added setExpireTime
* created its own createKey function
* refactored createKey_
added QUOTA Error type
added clear on QUOTA limit reached
added testRunner type support
should clear entire cache not only entries from the same domain
fedex address validation: fixtures renamed + request test done
now really fixed the on-first-load issue of the fetcher
Updated spells a little, they now apply more potion effects to the user and ignore the case of which they were typed in
Add reparse the given Template... Thanks @ someguy
formatted members
Merge branch 'master' of https://github.com/MadJinx/social_network
Fixed backend attribute types for facets
Merge branch 'master' of github.com:MageHack/elasticsearch
Changing promo location to be an image upload
This cron job should have been shut off two weeks ago.  In fact, I thought it was disabled...
scripts to convert the original avro file to json and a script to build necessary jars for parsing json and post them to s3
can import nltk, comes default on mortar cluster nodes
short cut for running job
SandBox Everything! 有史以来最糟糕的开发体验，竟然苹果官方没有详细资料。 Fuck Apple
some reorder, design fixes #48
Updated datascheme for address model
Generalized user-based resources. Added profile view
Create posts from contents
Correct block indent
Syncdb before generate
Fixed Buttons positions
add ds18b20 to make file, fix typo
Merge branch 'develop'
Merge branch 'master' into develop
Rather than pushing values to foreign keys via a vector, use a map so it can be pushed to multiple places.
SocialCee Headers
Add mesh to get_properties too in LUA, which should make it easier or possible to read the mesh of an object
CrashDumper: "Unicode: Yes/No" is not needed anymore

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1451 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
XFire: Fixed sending messages and maybe other things
(what was that madness? it should never work - are those original sources and am I just tired or not? o_O)

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@2214 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
added richer README text
Added copying file. No license text yet
added public domain  eclipse image
fixing readme
fixing readme
fixing readme
fixing readme

fixing readme
fixed capitalisation
adding first draft of code
Merge pull request #1 from Breton/master

First draft
Allegro 5 - Event and Timer from tutorial working
Graphics drawing
Allegro5 - Refactored - Added 'Application' class
Added license / credit header
Allegro5 - Refactor - Added ImageManager class
20/12 - Major update to remove a debugging class
Added extension point for adding new Node types to the query
Update 23 :
- Réglage de bugs divers
- Ajout d'une option : taille de la fenêtre du jeu personalisée
- Message d'erreur sonore ( désactivable )
- Préparation pour l'ajour du Jar Downloader
- Modification du background des préférences
- Ajout d'un background pour la fenêtre de mise à jour
Revision 28

- Encodage du mot de passe
- Beaucoup de trucs en plus
- Bug Fix
Added get a number function

Signed-off-by: David Silver <dms.silver@gmail.com>
Minor fixes.
Minor tweaks
Armour repair and upgrade
minor desc fix
armour fix + effectiveness
Couple of extra paragraphs of documentation for the README
bugs fixed defined() operator
renaming kmap in libexec.h
fix array setter bug.
Merge branch 'array' of https://github.com/nikuuchi/minikonoha
fix coding style
fix MiniVM.visitCallExpr
moving Bugs_ML592
Cleanup exercise scripts

* whitespace and comment cleanups only

Change-Id: Iab9c2d9a25c3473f14190d60f2f2cf5be0ed59dc
Cleanup tools scripts

* whitespace and comment cleanups only

Change-Id: I4e631e9a9b8151758dc8c96b3aef76b963d5ea7e
Cleanup stack/unstack

* whitespace and comment cleanups only

Change-Id: I31b3057657bb3bc5c4e085886ef6ac561967706f
Merge "Cleanup tools scripts"
Merge "Cleanup exercise scripts"
Merge "Cleanup stack/unstack"
Forced recloning
Merge remote-tracking branch 'openstack_dev/master'
Mingle 70 and 43
New changelog
Added a test entity
Fixed KeyPressed/Released events
Actually started using the InitializeWindow() method
Updated tests for World
Updated tests in AStarNode
Limpieza
Fix TortolasProject.csproj
NuevaFactura: Relaciones con diferentes subsistemas.
Rutina..
Diseño: Clase k-button
Commit de prueba..
Add CraftBukkit++ support

CraftBukkit++ is a modified version of CraftBukkit with many performance
tweaks. Because of the changed server name to "CraftBukkit++" PEX does
not work.
Merge pull request #423 from pdelvo/master

Add CraftBukkit++ support
Added confirmation message for /pex world <world> inherits <parent worlds>. issue #345
Added own Permission attachments
Merge branch 'master' of github.com:PEXPlugins/PermissionsEx
Opps, that was my fault :(
Fixed formatting and imports
Version 1.19.3
Added commands help with pagination. issue #374
Placing keyphrase above run and keyphraseset in models.py
Issue #10
Отредактироваль следующие 50 слов
new post:first app in appstore
new post:first app in appstore
Framework: Distance-Field: improved glow rendering a little bit
Framework: Distance-Field: improved glow rendering a little bit
Framework: Gui:: Refactoring: There's now an overridable abstract class to distribute automatic resource releasement
Framework: Gui: SingletonWidgetMap is working now
Fixed: NPE in /rename
Fixed: NPE on login
Added: /playersearch
JOANNNE: 'format middle column'
[tests] median_of_three - added third case
Friends are now sorted in alphabetical order

Geo Jarrad Double Lariat the friends list sorting issue
small cleanup
discus, google analytics, new recipes
--network-console: download network-console initrd
Merge pull request #423 from SickheadGames/develop3d

Initial WinRT changes, temp NOMOJO path, and iOS fixes.
Merge pull request #428 from SickheadGames/develop3d

Depth fix for iOS
Fixed a few problems with the templates.
Added a BuildServiceExtension to tap into the build process for content processing
Merge branch 'develop3d' of github.com:mono/MonoGame into develop3d
Merge remote-tracking branch 'upstream/develop3d' into develop3d
add collective.stats
Update jenkis buildout config
Merge branch 'master' of github.com:Siyavula/emas.buildout
create bit01
Add file cookbook/configuration/pdo_session_storage.rst
Merge pull request #128 from SongoQ/cookbook_configuration_pdo_session_storage

Add file cookbook/configuration/pdo_session_storage.rst
Dodanie reference/forms/types/time.rst
Merge pull request #129 from whisller/reference_forms_types_time.rst

Dodanie reference/forms/types/time.rst
Dodanie reference/forms/types/timezone.rst
Merge pull request #130 from whisller/reference_forms_types_timezone.rst

Dodanie reference/forms/types/timezone.rst
Dodanie reference/forms/types/url.rst
Merge pull request #131 from whisller/reference_forms_types_url.rst

Dodanie reference/forms/types/url.rst
poprawiony błąd ort.
dodanie wstępnej wersji strony contributing/documentation/translations
Merge pull request #133 from tkoomzaaskz/master

błąd ortograficzny
Dodanie pustego pliku book/page_creation.rst
Pierwsza wersja book/page_creation
Dodanie calego pliku w wersji oryginalnej; dodanie przejsc do nowych linii; postep tlumaczenia
Zmiana kodowania pliku book/page_creation.rst na UTF8 bez BOM
Postp w tlumaczeniu
Postep w tlumaczeniu
Postep
Koniec tlumaczenia
Merge pull request #134 from chrisbujok/master

Tłumaczenie book/page_creation
Added pause/start button
update mysql migration files
fix display ratecard
update documentation
fix asterisk import
Merge branch 'develop'
text fixes
Merge branch 'develop' of github.com:Star2Billing/cdr-stats into develop
fix aggregation and display of concurrent calls
Update frontend notification requirement
Merge branch 'develop' of github.com:Star2Billing/cdr-stats into develop
fix requirement django-admin-tools-stats
[Karrick & Mosh] fix windows launch bug
Update for Dutch language pack
fixing cfcase not styling correctly.
More xypic fixes

More robust regex, matching the, ahem, "rich" and "original" ways in which
xypic informs us that it's done processing. Will I ever be done???
remove validating presence of open, change ui of listing to separate closed and running auctions
Fix Crash bug: targets is released twice.
Fix bugs and finallize.
add GeoBundle
better meeting manager
better meeting manager
Merge branch 'master' of github.com:Toub/bewelcome-symfony
Revision (1.0.0.2) Update 1

--Minor code corrections and directory cleanup.
set more package dependencies
Update to the command again.
Start of custom Yaml Reader/Writer
Quick Links updated
Fix capturing photos
Merge pull request #7 from DDRBoxman/bagh

Fix capturing photos
Added msm7k repo
Finally fixed the rendered map, it was a bit of a hack though
fixing farsi font-page carousel issues
Fin animations part 4 (Kickstarter + gens)
Découpe image partie 3 - message du futur
CGit config and various config fixes around Apache and gitweb

- .cpl/params/cgit: copy templates for cgit.pl and cgitrc
- cgit/cgit.pl.tpl: Perl cgi with '@H@'
- cgit/cgit.pl: remove, renamed in 'cgit.pl.tpl'
- cgit/cgitrc.tpl: Perl cgi with '@H@'
- cgit/cgitrc: removed, renamed in 'cgit.pl.tpl'
- .gitignore: ignore cgitrc and cgit.pl, and nfs files
- gitweb/gitweb.conf.pl.tpl: add '@H@', remove for now gitolite/bin
- gitweb/gitweb.conf: removed, renamed in 'gitweb/gitweb.conf.pl'
- .cpl/params/git: copy template for 'gitweb/gitweb.conf.pl'
- .cpl/params/openssh: fix wrong copy for 'config' file.
- apache/env.conf.tpl: uses symlinks 'key' and 'crt'
                       fix gitolite 'bin' path for now
                       specify 'GIT_HTTP_BACKEND'
                         (should be in .gitolite.rc?)
- apache/gen_ssl_key_and_crt.sh: create symlinks 'key' and 'crt'
                                 try the new openssl config file 'o.cnf'
                                 add the generated certificated to
                                   '.ssh/curl-ca-bundle.crt'
fixed one small mistake in xhr
Generate from information
Use newer xformat
Set a default path
Some SRIOV questions
Fixed some DataField bugs. Started rewriting it's constructors.
Improved DbTest2
Set prefix to blank instead of null as default.
Fixed some formatting for DataManager.
Added some debugging and a check to see if value is null.
Formatting changes.
Adding some more debug and changed tableExist to Integer instead of String field type as COUNT(*) returns an integer.
Fixed getField returning, close after creating a DataField and not before.
Made outputDrivers only show up once, also removed custom ClassLoader as it is not needed right now.
Add a check to see if the values for the DataManager URL is set, break if not.
Added insertField method for DataManager.
Make setURL return a boolean instead of being void to make sure the URL was set succesfully.
Making changes to AnalyticsManager regarding exceptions.
Improved null detection.
Fixed navbar and fixed bug
Removed hard code false on is_member flag
update site to not use User.me
Update my about page and added a search bar
Merge pull request #9 from YaBoyQuy/jake_test

Update my about page and added a search bar
Merge branch 'master' of github.com:YaBoyQuy/CheckMeOut360 into categories
Inlcudes City Locator - allows a user to search for their own city
trying to fix display none
make byline in weekend gray
added login redirect plugin
Merge branch 'master' of https://github.com/YaleDailyNews/wpengine
Merge branch 'master' of git.wpengine.com:staging/yaledailynews

Conflicts:
	wp-content/themes/crosscampus/css/cross_campus.css
Merge branch 'master' of git.wpengine.com:staging/yaledailynews
redirect plugin
.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assignment 38/Assignment 38.suo

LAWL
BaseAI halfway there

Nog niet bruikbaar, de helft van het algoritme zit er in
activityQueue doesn't actually exist, which was causing battles to not have their contents properly logged. Fixed this.
Fix email reges
finish user sign
Add SSL in production
Use is for comparisions with None.
Created core library, with acompanying unit test
add cscope setting for vimrc
use new album, test
Translator for Juricaf.org
Improve RIS to Zotero date algorithm to work with accessDate. Add support for some EndNote quirks with webpage entries. Support EndNote's "internal-pdf" URI protocol. Fix note processing
Merge pull request #461 from aurimasv/RIS-dates

RIS improvements
Update Juricaf.js
Update Juricaf.js
Merge pull request #473 from adreagui/master

Translator for Juricaf.org
Fix escaping of backslashes in target
SUDOC: tweak "place" handling. Bump lastUpdated to push previous commit. PubMed: move url to attachment, since this is a catalog
add fulltext PDF to APA Psycnet
Merge branch 'master' of github.com:zotero/translators
adjust AMS MathSciNet target so it covers the mirrors http://www.ams.org/errors/msn-mirrors.html
fix multiples for DBLP
fixes to Tagesspiegel - tests may still be unreliable since the website is shaky.
small fixes for ProQuest, Hamilton Spectator, fishpond; Test updates for ILO Labordoc, CiNii, Galegroup, Handelszeitung, Twitter.
Cleaned up ScienceDirect translator. Added scraping for reference works by ISBN.
add AJC.com FW translator w tests and license
small fixes for Huff Post and Handelszeitung
fix AMS and GPO e-CFR
fix All Africa & Artefacts Canada. Delete History Cooperative
fix * improve informIT
Moved renamed menus, moved blocks around.
Fixed style to accommodate large scripts
Added kses-0.2.2
Added file missed in website commit.
add ad widget docs
added default renderheader function
sends < sent
Site updated at 2012-09-27 10:01:11 UTC
Site updated at 2012-07-22 21:19:10 UTC
using an alternate method for line->box collision
fixed enemy collision and setting death
Fixing FAQs
Added images
Modified BGTopMainLayer
Replace ok_button images
This interpretation of "git la/lola" works better for me... I don't use the default paging options.
Colored prompt magic!
Forgot the "skipit" characters in that PS1 definition... :D
Adding and initializing a bunch of new and awesome VIM plugins, many of which are also kudos @tpope, thanks to @tpope's vim-pathogen.
tile layer manage fps, update to come for loop
Mas proyectos con Kinect
Mas proyectos con Kinect
separate prototype files
intersectionLineSegment
separate out gestures
fixed config - use request factory
done: salesforce login integrated
Merge pull request #3 from alessiovalentini/salesforce_integration

done: salesforce login integrated
removed the inline style
teste
;
Formato de hacer post, desplazar textarea cuando se hace click, mostrar grupo y botones al mismo tiempo
Merge remote-tracking branch 'mrluisc/master'
Eliminar label group, corregir efecto expand post
Merge remote-tracking branch 'mrluisc/master'
Removed unnecessary routes
add lirc igorhid
fixed pebkac url tag name
restaurando gitignore.
Changed Judging widget to be radio buttons.

Field will keep the same signature max and min values.
tried bundle package
change version # for SEI
Call the callback with an error if the request is aborted.
The callback should always get called no matter what, to not do so breaks assumptions that hold for most other node libraries.
Multitype support, json data import
Fixing frontend
Option to update specific region for zkir
Renamed question 5 in shoulda contexts
Merge branch 'benefits_abroad' of github.com:alphagov/smart-answers into benefits_abroad
Move meta-data block into main body

This conforms with the general pattern across the site
republish the 'holiday entitlement calculator' smart answer
almost done with v1
old background.
future updates to controller made, beginning s3 integration:
finalizing schema for issues. Considering dropping 'variants' alltogether.
add some echos about pid.
Merge branch 'master' of https://github.com/amanar0302/sh-workshop