labofsahil/github-event-dataset-2012 huggingface dataset:
unbroke dialog pane, components now remove themselves from any pane they were in when you add them to a new one, stopped the music from killing the system on filenotfound, unbroke non-numeric input for bens Input textbox thingy.
Added networking stuff, server now listens and accepts connections but does not read or write any data
support for builds where no there is no taskkill
closes #80 need to have a buffer with a defined size passed in and back
Removed obsolete management commands.
Removes right padding from inputContainer-largeInput.
Adds repeatableObjectId-previewable sub-style for more gallery-like view of items.
Fixes missing : delimiter in content edit heading for page objects.
Changes styles to be more based on variables.
Changes default height of the image thumbnails in search from 80 to 100.
Fixes $.popup to not use event unless pageX and pageY is explicitly defined so that it's positioned correctly even on a manual trigger.
Makes sure that icon font is never bolded.
Adds multiple file uploads to the CMS.
Fixes clicking on popup window from drag-and-drop sometimes disabling itself.
preparing for formating price and released at in product partial on the javascript side
Primera version prod
add mod_pagespeed, more notes
fatal error checks

that's better, safely fails when no form exists now
fixed body layout
fragment title interface + implementation on each fragment
move management of the URL in scriptlistfragment
correction relative to class check
Make scriptlist displayed on the first tab
.. long long night :D
bugzid:3320 Testing PsiCAT API to resolve bugs automatically
Update 01-preface.txt
Merge pull request #1 from testing1234567/master

small change testing pull request
Updated category
Bumping version
Adding use cases to the wiki
Added tag rabbitmq_v2_8_1 for changeset 422fc4cbe385
Updated repo readme
Updated drools readme
Updated drools pom to have junit
Doc on relative paths
Add an inspect method that doesn't print the entire buffer

Also cleans up some whitespace
Add a binary-safe method for writing files on unix shell sessions

Also some tests for doing so, all of which pass on Linux, Windows, and
Java meterpreter, as well as shell sessions on Linux and Solaris. They
will fail miserably on Windows shell sessions.
msftidy found EOL spaces on new modules
Add ARCH_JAVA support to struts_code_exec_exception_delegator
Merge pull request #463 from schierlm/struts_arch_java

Add ARCH_JAVA support to struts_code_exec_exception_delegator
#1248 - Kavitha/Suganthi - Sync single child error messages logged on sync failure
#1248 - Kavitha/Suganthi - Setting sync log when sync all children fails
#1248 - Suganthi/Kavitha - Refactored sync
Biblioteca JTable
added budget and hobbit_wiki
blog sidebar changed to use accordion
Ignored
blog sidebar changed to use accordion
Added note about previous DataRowVersions in README.md (from Daniel's email)
rename package from io to com
Working copy - Still no 64-bit.
added hsv version
Merge branch 'develop' of https://github.com/rhololkeolke/EECS-376-Alpha into develop
adding stuff needed for testing
rearrange
updates
rdoc/task instead of rake/rdoctask
Untracked tmp files
Move the constants to an attribute file so it can be overridden in other cookbooks

I'm using these recipes to deploy our companies settings to both osx
and ubuntu dev and servers machines. Several of those are multiuser
environments.

I wanted to put the bashrc file in /etc and the different subelements
in /etc/bash.d/

Due to the use of contants i was not able to do this unless i copied
the enitre recipe/provider/template etc.

My custom attribute content

```
node.override["bash_includes_subdir"]="/etc/bash.d"
if node["platform"] == "ubuntu"
    node.override["bash_bashrc"]="/etc/bash.bashrc"
else
    node.override["bash_bashrc"]="/etc/bashrc"
end
```
Merge branch 'improvement/allow_custom_bashrc_subfolder'

* improvement/allow_custom_bashrc_subfolder:
  Move the constants to an attribute file so it can be overridden in other cookbooks
Trying to resolve conflict...
Merge remote-tracking branch 'origin/master'
Merge pull request #66 from rossbruniges/dev

Changes from Lighthouse - for ideation closing push
Update apps/challenges/migrations/0044_move_votes_to_parents.py

Updated migration to manage cases where the Submissions have been removed.
Merge pull request #69 from alfredo/dev

Update apps/challenges/migrations/0044_move_votes_to_parents.py
Merge pull request #74 from rossbruniges/dev

Lighthouse tickets
Merge pull request #75 from rossbruniges/dev

Changing 'proposals' to 'apps' and fixing a number of related bugs
Merge pull request #76 from rossbruniges/dev

Using a better flag to highlight the lull between ideation closing and development opening
Merge pull request #77 from rossbruniges/dev

[Lighthouse-152] Ammending the about page copy
Merge pull request #84 from rossbruniges/dev

Creating the required models, forms and views for the development stage submissions
Bugfix: Entries missing a parent.
Merge pull request #89 from alfredo/dev

Bugfix: Entries missing a parent.
Adding in basic resource page mechanics - and a place for the resource page assets to be uploaded
Changes to splash and about copy / more clearly explain the program.:
Merge pull request #92 from benrito/dev

Changes to splash and about copy / more clearly explain the program.:
Hacking the resource assets to attempy to have them work in the ignite template
Trying to get the SVG assets to server correctly on the local machine
Creating a page to embed resouce videos into
Creating an index page through which the resources can be viewed
Ensuring that the resources page can be turned on when needed and not before
Better error handling and a nicer backend UI
Merge branch 'resource_pages' into dev
Added SimpleMap and MapListener plugins
staging: android/lowmemorykiller: Better mm handling + Settings Tune
include tsi KConfig
update defconfigs
build: update mod version
defconfig: CPU_VOLTAGE_TABLE enabled
strip back overrides and only keep header change.
Moodle backup code for stack questions.

Without the corresonding restore code, it is impossible to know if this
is really right, but the XML generated looks complete and plausible.
Added path-stuff.py, which uses os.path-related tricks to find out the program's working directory
Adding a link to my working repo to the README
added new state based view
Added a method to compute a star subdivision.
edit tab(subjects)
Merge branch 'develop' of github.com:secret-development/real-box into develop
added link to rails-folder-structure-in-progress
add ipad()
added more styling for small screen sizes, specifically boxes around the text.
hide the registration image and the link on Navigation bar
massive renaming of files so that nothing starts with underscore
fixed page break CSS, oops
removing background and padding for code blocks. maybe for HTML only we'll keep this?
Merge pull request #23 from shiffman/steve

Change url to Steve's ConwaysGameOfLife project
small chapter 3 fix
updating CA steve klise link
added all sorts of Proxima Nova font stuff
adding css for variable margins depending on left or right pages
fixed code bold ital styling and added gray to table header
style for monospaced formula with indentation
illustration font fixes
a bunch of exercise table and image fixes
exercise 6.9 fix
exercise 6.17
exercise 8.2
Merge pull request #26 from shiffman/evan

illustration font fixes
chapter 8 fixes
chapter 9 fixes
Styling for .stretch code blocks
Merge branch 'master' into steve
chapter 10 fixes mostly tables
add hello world script by php
C
D
Adding 
JQuery related UI + server models and views
! Final fixes to spacing bussiness.
teit muzelflash er teit
убрал в адресе index.php

при входе в админ панель в адресной строке отображался адрес с index.php
New readme and stuff
Bump version cl
footer landing fixed
continue
compiled writing logic for lcd device

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
ocding view of mac address changing etc

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
edit code for evaluating motor and point controller, and reconstructing budget

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
fix wiring of MotorController.sch and clear DRC errors

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
renumber MotorController.brd

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
ditto

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
fixed clearance error in MotorController.brd

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
Merge branch 'edit_new_uart_schematics' into coding_lcd_menu

Conflicts:
	DeviceSoftware/TusDevice/EthernetBridgePp/EthernetBridgePp.cppproj
	DeviceSoftware/TusDevice/TusDevice.atsuo
	TUSBudget/TUSBudget.suo

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
identify schematics by the order number on schematics and submitted gerber files

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
repair TusBudget project by deleting files in GeneratedArtifacts

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
associating parts of MotorController
ditto
associate of parts of SensorController_revB
4th budget submitted

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
fix box hole position

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
fix resistor value of MotorController

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
compile cleared

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
add configuration files
add project of reading layout definition

Signed-off-by: sosoru <siva6991@yahoo.co.jp>
Fix: changelog
Release 3.1.2
Fix: avoid warning
Merge Dolibarr 3.1
Add addgroup functin in admin users
Propagated updates
* Added CPU usage and Current Job to the node Heartbeat
Removing tests.py from the top level
Updated to version 0.71.
allow killing with `*::die`
scide: on Mac, make one global menu to share by all windows
Remove useless fields on account models
Nu kan man tilføje metoderne til en txt dokument.
Merge branch 'development' of https://github.com/syre/SortingIndustrialRobot into development
opdateret robot, wrapper og methods.py
Converted to Android Prj
アーティクルの背景にテクスチャを利用するように変更
voting works!!!
omg yes doesn't crash on title change
- the parser returns the DynamoQuery object
- moved helper active patterns to the test since that's the only place using it
Bump gaia commit
If you supply erefs with a module name, it will print out all of the functions imported by other modules by that module name
complete re-do of the sources engine. not finished yet
Merge branch 'v3.x' of github.com:tm1000/Caller-ID-Superfecta into v3.x
Changed title in header partial.
window mng
more MVC
Update coreserver/src/edu.harvard.i2b2.crc/src/server/edu/harvard/i2b2/crc/dao/setfinder/querybuilder/BuildTempTableSql.java

fix a bug caused by the syntax difference between oracle and postgresql
stats added more
Top nav and customization
contents 3.9 recovery from 回复 to 恢复
add 3.10
modified importer to directly interface with gz files and to fix
delimiters in each file (if necessary) when loading
Merge branch 'master' of https://github.com/vadasg/githubarchive-parser
Changed footnote to a .txt-friendly format.
Version bumparooni
Hooked up search and facets to blacklight (VOV-216)
Set @baseFontSize back to 13px (default changed it to 14px in twitter-bootstrap-rails v2.1.2)
Merge branch 'master' of github.com:variations-on-video/hydrant
Merge branch 'master' of github.com:variations-on-video/hydrant
Fixed bugs in ingest workflow
Templates for bigdatadev
Removed references to HTTParty module
Updated dependencies. +typhoeus +rspec
Parsing and Downloading Cities
Province loading tests passing
Fuel loading specs
Added rake spec task
Search Results specs and Measure parsing spec
+magic_encoding
lat/lng mapping WIP
Geocoded measures spec
SearchResults#offsets
Downloading measures in paralell
Search Results changes
+typhoeus verbosity
Holy Fuck. Retrieving search results with 20 threads in parallel seems to nuke the server.
minor fixes
removed rogue data from testing
updateing R.java
File Manager: Link painting fix
FBのバグ修正
Type safe criteria queries
added some missing file entries in hook_menu
Grading rubric
build.sh - removing and reinstalling dependent packages for fb303
Not building libthrift-erlang
modificación mensaje de redirección en agregar concurso
started support for swagger-generated model
adding dependencies, removing some old rakefile stuff
Version 1.8 is released
Validation playtime
First commit. Added files from treasure hunt to build upon.
Merge branch 'master' of github.com:yash3ahuja/C-Text-Adventure
test session expiration by reusing client id and password
Merge pull request #52 from emiloslavsky/master

test: use client[id,password] from session1 to open session2, close session2, get expired session event in session1
simple script to change oneline in given file
Upload works, shared memory works, it can now upload all my wallpapers
(but needs forking on the upload, it's taking too much time on my
crappy connection)
Added Enabled setting to preferences XML

For issue #5
Implemented Enabled preference to close #5
Stick to ReactiveMongo master
Changed interpreters to handle everything parsed.
Updated parsing workflow to pass $is_final to xml_parse().
Test both single-line and multi-line data.
Test both well-formed XML and valid entities.
Created basic reader test.
Added stub code for setting up interpreters.
Added a copyright notice.
Resized icon to 256x256.
Prof update

fixed request course query - pointing to non existing table. (
courserequest changed to CourseRequest)
Fixed cancel link in edit profile
back
back
hazfe back ax
ax
ax
ax
added subhead for comments
Add plone 4.2 test buildout.
refactored to use chain of responsibilty for matching
Display message if there is no word in dicts
css image sprites
Changed the fadeTo setting to give a more fluid look on changing the fields under the admin overview calendar
Fix frustum aspect ratio after resize and morphs.
Update all frustums before morph.
Merge pull request #220 from AnalyticalGraphicsInc/resize

Cesium Resize
Update CHANGES.md
Include the name of a uniform that gets set to an invalid value.
Merge pull request #228 from AnalyticalGraphicsInc/name-that-uniform

Include the name of a uniform that gets set to an invalid value.
Merge remote-tracking branch 'origin/master' into sandcastle-gallery
Add a computeAvailability to DynamicObjectCollection and CompositeDynamicObjectCollection.
Clean up some classes.

Now that tile providers have a ready flag, Bing doesn't need to store a
queue of deferred tile requests.
change css and category pages
adjusted the text indcator's x and y
Merge pull request #44 from hsanchez/master

Layout Handler has been pushed
2012-10-13 00:00
i18n

Fix an unencoded non-ASCII character.
Update PO file with v4.0's strings.
fixed readme
fixed conflict
Added image link
set-battery-font no longer interactive (never meant to)
fix minor modes list
improve mode-list-to-string-list
pre-propertized full-mode-string
fixed major mode-name for dired mode
added parent groups for sml and sml faces
update copyrights (f*ck miui.su)
Remove warnings from static code analysis.
Merge pull request #28 from stefanbeller/master

Remove warnings from static code analysis.
Performance tweak: make sure dead enemies skip logic() calculations
We check the "corpse" flag which is set once the dead body stops moving
Improve performance when there are many corpses
Fix merge conflict with BehaviorStandard
Merge pull request #29 from dorkster/bugfixes

Improve performance when there are many corpses
CMake: enable -Wunreachable-code and -fwhole-program for gcc/clang.
Merge pull request #30 from stefanbeller/master

CMake tells gcc to generate faster code.
Disable Gamma slider by default
Finnish 0.17 engine translation by Timo Sievanen
Merge pull request #31 from igorko/master

Disable Gamma slider by default
Update Russian engine translation
Merge pull request #36 from SBasalaev/master

Russian translation for engine
More on Russian translation
Merge pull request #37 from SBasalaev/master

More on Russian translation
Ignore left-click inside MenuCharacter area
Merge pull request #38 from igorko/master

Ignore left-click inside MenuCharacter area
Don't clear and re-fill character stat list every frame
Merge pull request #39 from dorkster/bugfixes

Don't clear and re-fill character stat list every frame
Only refresh MenuCharacter when stats change
Add live field to address
More Experian, Vehicle, Drive integration
before doing major revision on glos updater
changed default value for units in the metadata table from null to 'none' to avoid insertion errors into sos dataabase
FlowPanel for todos is no longer provided, but created by ui builder
fixing nuget ref's and rev'ing buildsupport
Added UserError class and used it to handle a lack of input vectors and display a nice error message to the user.
Update short/templates/home.html
Site updated at 2012-04-18 16:35:30 UTC
Updated to Bukkit-1.2.5-R1.3-SNAPSHOT and Vault-1.2.15-SNAPSHOT
Dump
Change
Added C2DM ID Registration
Build a different mksnapshot for each arch.

Since mksnapshot uses different source files for each
arch, building it in a single location fails when switching
between builds.

This uses a separate version for each arch, using the
same variable that is used to select which source files
get built.

Change-Id: I8608bf3b0f85571c75c7f6b21e47091ef8ed8c3f
Merge "Build a different mksnapshot for each arch."
am d5ee4b89: Merge "Build a different mksnapshot for each arch."

* commit 'd5ee4b89f462d11f8027aba6409b41aa94a4056a':
  Build a different mksnapshot for each arch.
am 9413bcbe: Merge V8 at 3.9.24.21

* commit '9413bcbe2192ed4d701281130490e0ba336debdc':
  Merge V8 at 3.9.24.21
Build d8 instead of v8shell.

d8 is the preferred V8 debug console.

Change-Id: I2b0c63133e619a4bdc531fd0b4acfde185703f45
Fix profiling functionality provided by V8 for x86

Change-Id: I0af645b60f7aa90472ff9c9ddff6b3b2df92e914
Signed-off-by: Lijuan Xiao <lijuan.xiao@intel.com>
am 7a930e02: Merge V8 at 3.9.24.24

* commit '7a930e02c0b52d70d022ed255db551895dfe1157':
  Merge V8 at 3.9.24.24
am 1dd46b47: am 7a930e02: Merge V8 at 3.9.24.24

* commit '1dd46b476b705bdc016f86359b089c3de2dff7cf':
  Merge V8 at 3.9.24.24
am 84774f4b: Merge V8 at 3.9.24.25

* commit '84774f4b8cb56f14184c96dd08fb2ae119d986e0':
  Merge V8 at 3.9.24.25
am 5710ceac: Merge V8 at 3.9.24.28

* commit '5710ceac03e2cf7a164ad7393b5a6b6114ea45e6':
  Merge V8 at 3.9.24.28
am 08f6c96f: am 84774f4b: Merge V8 at 3.9.24.25

* commit '08f6c96fc894987f8ddd5e0c71466eeac4481fc3':
  Merge V8 at 3.9.24.25
am 7523901f: am 5710ceac: Merge V8 at 3.9.24.28

* commit '7523901fd9f17e9755b1e4e37201edade0dc24f6':
  Merge V8 at 3.9.24.28
Reconcile with jb-release

Change-Id: I9597b2581342c91f69bbabec6cda064dd3c8275e
am 21eaa3b0: Reconcile with jb-release

* commit '21eaa3b0abc4562dac0be1acebe2fdf35335e752':
  Merge V8 at 3.9.24.28
am 4768e9d2: Merge V8 at 3.9.24.29

* commit '4768e9d22b13edbae2ae177109420028748bf872':
  Merge V8 at 3.9.24.29
am 6331c683: am 4768e9d2: Merge V8 at 3.9.24.29

* commit '6331c683f5e6a2a3400ccbdafc79920e0f44593b':
  Merge V8 at 3.9.24.29
Merge "Fix profiling functionality provided by V8 for x86"
am 82ab90db: (-s ours) Merge "Fix profiling functionality provided by V8 for x86"

* commit '82ab90dba66a052f1d57e9b89184b0fa6e6a701f':
  Fix profiling functionality provided by V8 for x86
am 10a03d2f: am 82ab90db: (-s ours) Merge "Fix profiling functionality provided by V8 for x86"

* commit '10a03d2f0fcfae2ed7a9e0d8af857f2b69948785':
  Fix profiling functionality provided by V8 for x86
Reconcile with jb-release

Change-Id: Ib5a40ba42a95be1f39b6135ce5888741234ce15c
Unmount all asec apps before encrypting

Now that forward locked apps are stored on /data as asec image files
that are mounted, they need to be unmounted before /data can be unmounted
so it can be encrypted.

Change-Id: I7c87deb52aaed21c8ad8ce8aceb7c15c2338620a
Only cleanup ASECs in external storage DO NOT MERGE

Any ASEC or OBB files were unmounted when USB storage was set to UMS
mode. This changes it so only ASEC files on external storage and OBB
files mounted from external storage are unmounted.

(Cherry-pick of 93ecb38daded7583a4a61f4f22519bb7a8a8c154)

Bug: 6948035
Change-Id: Ib60727bd360caa32173797ff5b4e1e21fcf20054
merge in jb-mr0-release history after reset to jb-dev
Merge tag 'android-4.1.2_r1' into jb-merge

Android 4.1.2 release 1

Conflicts:
	VolumeManager.cpp

Change-Id: I2273051f972864bb44e246b48bf80bb8a4a94bdc
Add tag matching to pairdelete and paircopy2
Handle tagged attributes with multiple values in rlm_perl.
Fixup some warnings in rlm_perl
Updated main EDD file to load everything via the new Easy_Digital_Downloads class
Replaced bbPress comment with EDD one
Added new {fullname} email template tag
Restored edd_get_failed_transaction_uri()
Updated version to 1.3.4.3
[i18n]> french.po.mo/edd.pot ready for 1.3.4.3
Merge pull request #540 from fxbenard/master

[i18n] > update french.po.mo and edd.pot for 1.3.4.3
Fixed #543
Merge pull request #544 from sunnyratilal/master

Fixed #543
Added Payment Gateways and a link to the Invoices add-on.
Merge pull request #545 from sunnyratilal/master

Updated Readme
added template tag parsing to email receipt subject line
fixing typo (sort of), changing function call edd_email_template_tags() to edd_email_templage_tags(). Not sure if the typo is mine or in the original function name.
Merge pull request #547 from innerbot/564_parse_email_template_tags_in_subject

implementing #546 parse email template tags in subject
Fixed function spelling error for #547
added filter in edd_format_amount function

The function edd_format_amount was very restricted the amount of decimal values​​.

With this filter you can work with currencies like Bitcoin.
Merge pull request #548 from claudiosmweb/master

Add filter for decimals in edd_format_amount() function
Merging with master branch
Added wp_reset_postdata() for #549
Fixed incorrect parameter name
Update ProvaGitHub/src/prova.java
Travail de mission
Loading cards from JSON. Shuffling and Assigning to players.
Added Text-Shadow to "Hanover High School"
add more content
update font size
Defconfig:KernelPatch And More
View for metadata of an object
track local FWB
Added .removeButton class.
Auto sync from Bitbucket [893ad9aa1d1f] Modified README.md
lazy macro querying in ReplacePathToMacroMap
first check, then allocate StringBuilder
[^ann] IDEA-83206 Status bar: action description is not shown when mouse-hovering over main menu items if Log message tool window is open (cherry picked from commit a8d6c93)
[^denis,kb] fairer completion type statistics (cherry picked from commit 3bc7aab)
don't assert read access in Document which is for non-AWT use (cherry picked from commit 346fac0)
IDEA-83399 Event Log: link from a balloon is not shown (cherry picked from commit 7776bd8)
IDEA-83394 Gradle: project refresh does nothing after removing Gradle home from Template Project Settings

1. Using per-project slave gradle process now;
2. Corrected GradleConfigurable balloon processing;
Test cleanup
Test cleanup
Test cleanup
FindUsages for Java step definition implemented
IDEA-89318 Missing question mark in stop confirmation
EA-37493
Platform: Cannot Undo... dialog references some not-existing Dummy.txt file (OC-4896)
(cherry picked from commit 7e3db0cf4eaf79bc88e748848fe4e25e8d595035)
IDEA-19061 Integrate the Rearranger-plugin into core-IDE

Showing 'close' icon for the condition nodes
IDEA-19061 Integrate the Rearranger-plugin into core-IDE

ArrangmentSettingsNode -> ArrangementMatchCondition
IDEA-19061 Integrate the Rearranger-plugin into core-IDE

1. Add ability to remove atom condition via single click;
2. Refactoring;
IDEA-19061 Integrate the Rearranger-plugin into core-IDE

Green code
QueueProcessor: survive on LOG.error in tests
fix rgb fields for Windows laf
make popups resizeable again
Update Intelligent Duplicates Management/README.md
don't render chart everything event is fired
forgot config.h.in
Limpeza general
Updated 3d graphica
fix nr.1
Non-activated users sent to message screen.
Omnicidals kill others
Add a first, quite useless unit test
Russian translation added
Fix autocompletion with empty queries
add datepicker to single value datefields if bureaucracy is installed
added simple summarizing to datatables

only shown data is summarized, so when a table is filtered only the
filtered data is summarized
added alignment option for data tables
save last modified dates with pages
added %lastmod% to use last modified date in outputs
fixed datafilter for columns ending with a S
Use new SQLite helper interface
README added
fixed URL in README
Merge branch 'pdo' of github.com:Klap-in/dokuwiki-plugin-data into pdo

Conflicts:
	syntax/table.php
Add create Order
Site updated at 2012-11-16 15:31:21 UTC
fat-finger URL
SubMaps works better now, not perfect yet.
Merge branch 'master' of https://github.com/Emudofus/BehaviorIsManaged

Conflicts:
	Behaviors/Game/World/MapTraveling/Storage/SubMapDataSource.cs
Merge branch 'master' of https://github.com/Emudofus/BehaviorIsManaged

Conflicts:
	Behaviors/Game/World/MapTraveling/Storage/SubMapDataSource.cs
Merge branch 'master' of https://github.com/Emudofus/BehaviorIsManaged

Conflicts:
	Behaviors/Game/World/Cell.cs
	Behaviors/Game/World/MapTraveling/Storage/SubMapDataSource.cs
Hotfix
A try to avoid future conflicts due to whitespaces
Added the cells bound to a submap neighbour.
Some funs with .algo submap
Merge pull request #9 from Emudofus/master

Import Emudofus/BiM
I have to create a web service
editorsetpanel, multiple stamp fix
trivial
Stuff i forgot from last time
- ‘DocumentsMockupToolbar.png’
Remove debugging printf.
Merge pull request #3 from davidlehn/master

Remove debugging printf.
[buid 41] bug fix : getAllObjects with an empty filter
Service Working to My Server
winning and losing screen
winning and losing screen
images replaced
More links

and a favicon, minor css changes
Fixes 'Alinhamento do título do post com os widgets está ruim'
fixes 'As categorias devem aparecer somente no final do post'
Fixes 'Corpo do post está fino, tem 460 de largura vs 520 do blog da RD' and 'As quebras de linhas não estão legais'
Fixes 'Precisamos de um call to action de final de post. Esse cara vai aparecer em todo final de post. A action é assinar o feed via email, ou seja temos que ter um campo e talvez um botão.'
beta beta index

se que esta horrible pero pues es perder mucho tiempo en el diseño boots
es una loba
Update cookbook/symfony2/the-symfony2-security-component-and-propel.markdown
more view / template bug fixes
rename about_us.js
Fixed Python output
Added write script for read test
Updated credits again.
last commit, colors, form fields, language options
also remove member activities when removing class member
secured.tag
 - removed hide and show effects for PopupOpener
thread.jsp
 - showed the details by default
add_attachment.jsp
 - fixed: don't allow empty library value
used async list loading:
Begin Example 3
don't create folder with trailing slash, fixes #37
ps5-3
folderScan pre-alpha
folder scan version dev
test folder 1 fixes
0.1.5 varnished
summary microfix
Merge pull request #1 from RomanZander/folderScan

Folder scan
made assumption of ref returning from constructor
code offset logging
added callstack test
added stack underrun test
removed unused variable
throw exception on logger.error()
added disassemble()
local stack array
implemented stack.get()
Added the url to open after installation, to avoid searching for 10 minutes the default port.
Modified the default url to highlight
Open up browser in readme
Update Flask
Ctrl+c proper shutdown
Enable both nzb and torrent by default
Use default user download dir and enable blackhole
Add less important info log
Add newznab host to found log
Just use basename of __file__ when restarting. fix #982
import cleanup
One up
NZBClub RSS doesn't support https. fix #991
Return everything but None
Clear queu tasks. fix #997
Ignore extracting folder. fix #1004
Fedora init fix #1009
Added initscript for ffpstick closes #992

Thanks to @MariusRugan
Return boolean properly
Disable nzbclub by default
First start improvements
Redirect fix
Added data_dir option to use a custom data_dir
Merge branch 'datadir_option' of https://github.com/bwq/CouchPotatoServer into bwq-datadir_option
Merge branch 'bwq-datadir_option' into develop
Added bootstrap-dropdown.js to the template and updated to jquery 1.7.1.
Add client in Javascript, Mootools based
Add client in PHP
Add clients in C# and Java
Add README for repo root
Added a readable version of teams.
Getting that index.html committed properly.
add PDF back
Revert Because I Don't Remember Why The Hell I wanted This...
SEC-2025: SecurityContextLogoutHandler removes Authentication from SecurityContext

Previously there was a race condition could occur when the user attempts to access
a slow resource and then logs out which would result in the user not being logged
out.

SecurityContextLogoutHandler will now remove the Authentication from the
SecurityContext to protect against this scenario.
m2e config ready
Fixed subfolders for m2e
Added open hardware logo

 On branch development

	modified:   Lib/footprints/logo.mod
Basic disqus implementation for public commenting
Ooops. J'avais supprimé certains changements lors de ma résolution de
conflit.
Add input_volume_up, input_volume_down.
Added mysql gem to build
Added example of using pre
Make ringfile.rb be parsable by Emacs's ruby-mode.
Add a dependency on Keystone.
Move to using GPT partitioning and UUID disk naming.

  * Get rid of the disk providers.
    They did a lot of stuff we really don't care about, and fixing
    them up to rip out cylinder-based space accounting and work with
    GPT-based partition tables was more effort than doing just what we
    need to do in the disk recipe.
  * Use UUID-based disk names in Swift instead of device-based names.
    Instead of mounting and referencing disks based on device name,
    mount and reference them based on the UUID of the file system
    involved.  This makes the Swift recipe immune to failures that can
    arise when the disk device names change, which can happen for
    reasons too numerous to mention here -- in general, device names
    in Linux are not stable.
populated places heatmap
new york bus route animation demo
ignore swp
Exercises.java added documentation
Added vcr and fakeweb to the Gemfile
Setup vcr for specs
Added method to resolve links
Don't use std::tr1::shared_ptr<>
Added ConnectionFailed Screen
Placed sidebar-first to the right and created breakpoint for stacked version
Add abount, rewrite index, rm pages from navi..
Merge branch 'master' of github.com:abellong/abellong.github.com
Second version of README.md
Prevent block usage on inappropriate pages
+++6
+++6
+++6
+++6
Change version from alpha to release
[-] FO : Escape de la search query
[+] FO : Ajout de l'option per_page dans la recherche
Merge pull request #2 from aeyoll/feature/fix-search

Feature/fix search
added section on validating parent model
update medication and immunization and add referralSummary
Please enter the commit message for your changes. Lines starting
Fix #1. Death link
Added save and restore for best chromosome

The resstore function is still unstable, but the store function works
fine. Added the isLearning property to AI_Car script editable by GUI.
Experimenting with POD to Textile formatting
now if some bundle have not date fields, timeline view would not appear for him
add sorting to filter_order array in facet_collection_settings
Update tokenapi/views.py
added custom error page for 404 status code
Descripción del README
Site updated at 2012-03-18 11:42:04 UTC
Imported next SP release
bla
Merge remote-tracking branch 'dhafin/master'
sfasf
sfasf
Merge pull request #2 from haydarai/master

Workshop
Merge remote-tracking branch 'upstream/master'
Added 3 new patterns. Declarative Component Dependencies. Interdisiplinary Expertise. Many Products Coexist. Also added corresponding images.
changed frames to binary mode so that proxy ssh works, added mask settings
Octopress init
Site updated at 2012-12-04 15:09:36 UTC
Site updated at 2012-05-24 17:44:01 UTC
Funciona con el sistema físico falso. No consigo hacerlo mejor. Sorry.
Borrando basura
Solved Problem 120 of Project Euler
Merge pull request #1845 from vishalduggal/timob-8247

[TIMOB-8247] Constrain both width and height during layout
[TIMOB-8679] Fire load event on successful load of file url
Merge pull request #1992 from vishalduggal/timob-8679

[TIMOB-8679] Fire load event on successful load of file url
[TIMOB-5468] Support background Left/Top Cap for Row
Merge pull request #2524 from vishalduggal/timob-5468

[TIMOB-5468] Support background Left/Top Cap for Row
[MOD-802] Added docs for ti.cloud friends, message, events, and files.
Merge pull request #2600 from JeffEnglish/MOD-802-master

[MOD-802] Added docs for ti.cloud friends, message, events, and files.
bump CI version of 2_0_X to 2.0.1
add ExceptionT
more tests for zipSink
scalacheck test for binary lines
added user model, added signed in behavior
Added QuoteTypeLibrary as project to be built first.
Updated pages/books.md
PS추가
Included mime library for Windows users
Enable default user when giving no arguments
Site updated at 2012-05-08 11:47:35 UTC
Just forgot to remove some unwanted chagnes
calendar highlight version 1
added clock to top left corner which responds to IRQ0
sched/nohz: Rewrite, fix and add more accurate load-avg
 computation
sched/nohz: Rewrite, fix and add more accurate load-avg
 computation
nohz fix
Better progress communication with cleopatra.
Extra progress reporter for symbol stripping
Fix wrong progress event.
Use my opt build instead.
Do JSON.stringify in worker when combining profile + symbolicationTable
Merge pull request #9 from mstange/master

Use cleopatra progress bar for symbolication progress
Removed the dependancies for testing
added fonts, modified colors, added word def
Merge branch 'master' into gh-pages
Version 1.0.1 of the SharePoint 2013 Scripts

Code updates cause I couldn't sleep
Add explicit file resource for prefix directory
Bugs and small fixes
Site updated at 2012-10-31 06:03:04 UTC
Updated comments with the namespaced notation, and added the "Tag" suffix where needed.
Site updated at 2012-10-23 05:50:40 UTC
tweaks to cartage partial
fixed glitch for show page
mudança no artifactId
Merge remote branch 'origin'
README
Update README with API usage documentation
firefox for android
MINOR: Docs update - another submodule idea - subshops
changed initial jump
updated postgresql class to support ubuntu 12.10
added ubuntu 12.10 in postgres version check
Merge pull request #49 from ssidorenko/master

Added Ubuntu 'Quantal Quetzal' 12.10 support
Disable eviction on indexing caches.
Site updated at 2012-10-17 05:22:48 UTC
Improve Epub generation
Typeset epigraphs and quotes in days 1--15
Added Brain. Sub highlighting. World.

A brain has been added to control user interaction and game flow. You
can now click on the submarines to highlight them, and potential
movement paths are highlighted on the map in yellow. The map has been
renamed to World, and is now in charge of tile manipulation.
Symphonia No. 10 added.
Updating site and resume.
bumped version to 0.6.7.
bugfix: ngx.re.gmatch might loop infinitely when the pattern matches an empty string. thanks Lance Li and xingxing for tracking this issue down.
bugfix: pattern matching an empty substring in ngx.re.gmatch did not match at the end of the subject string.
bugfix: ngx.re.gsub might enter infinet loops because it could not handle patterns matching emptry strings properly. bugfix: ngx.re.gsub incorrectly skipped matching altogether when the subject string was empty.
added a (passing) test for empty pattern in ng.re.match.
Merge branch 'master' into thread
Move SQLitePlugin.java into com.phonegap.plugin.sqlitePlugin package
Fix Android plugin for Cordova 1.5+
nopey
Merge https://github.com/chopeltsering/inClassProblem

Conflicts:
	src/inClassProblem3_part2/BidirectionalChannel.java
Starting to work on post controller
Remove stupid quote
Inclusao de Testes de Espetaculo
add/move changelogs
tweak readme
Added code fix for setting final modifier for setter params.
add support for multiple word queries for ranked relavance
add AES encryption(not finished yet)
extracted text using grep and vim
ignoring wav
ignoring pdf
Bug in phones list fixed
align_ex.sh now passes additional parameters to align.py
no more dictionary errors
New textgrid.py
new textgrid.py
added support for py2.5
squashed a bug in -t, which caused phone label files to be miswritten
Merge branch 'master' of https://github.com/cmesher/InuktitutAlignerData
moving textgrids to a seperate folder
moving wav to the data folder to run the aligner
removing test english files
puting labels into data folder
renaming lab files to remove spaces
renaming wav to remove spaces
renaming textgrids folder to source text grids
removing swap file
Merge branch 'master' of git://github.com/kylebgorman/Prosodylab-Aligner
Some docblock, we could reduce the directory chmod process if the extension folder is actually exist.
Another refactor, use recursive chmod only if the extension name actually exist.

Signed-off-by: crynobone <crynobone@gmail.com>
update google plus refs
Site updated at 2012-06-24 03:50:36 UTC
Send the correct article's title when commenting, so we don't need this hack anymore.
cmfplacefulworkflow: 3 added, 2 fuzzies
added texture packs
commit to solve merge problem
Site updated at 2012-08-03 13:37:30 UTC
put mixins in the active_admin namespace
Swap faker for ffaker which ffcrm uses. This also removes the 'already initialized constant VERSION' warning message as both faker and ffaker were being loaded.
forgot one part of spring.extended
Removing ScriptingBridge attempt. What a piece of suck.
removed new_relic, fix big picture naming
Add post 2012-11-09-the-intuition-is-correct.html
add table with description of the different CPUs used
fix hickup
Added google's vim python indent script
added initial phpDavaProject files
Updated links to include itemid
- funky groovy stuff
Corrections to anchors
remove sort by prio if column is sorted
ui erstellt?
first post
Merge github.com:desc1984/desc1984.github.com
added mod SSL
design
ui work
title of page, back to adding features mode :-)
Merge branch 'master' of https://github.com/dimitrismistriotis/aotm-mobi
* Renamed file framework.php to ti-framework.php.
* Moved bootstrap logic to the bottle of file.
* Added new configuration option for __application.php file (TI_AUTOLOAD_FILE)
3.3.2V: Programing:Main 5.0v: Obstacle
3.4.0V: Programing:Main 7.0v: Arrow
hide start and .quals dne
updated to use all the latest gems
Updated .bashrc and .bash_aliases.
Added Spring WebFlow.
Refactoring existing code.
Update it to add occupation with AdR.
Site updated at 2012-12-18 09:52:21 UTC
Changed timeframe for university.
Version 2.5 - Fixed jerry can bug

Fixed - Jerry can bug when buying full with empty in inv.
Fixed - Odd guns all have a value of $25
Add lecture 9 code
Now that using tags, can use git describe for version number
Last proof edits and tweaks.
Add link to Lulu page to buy hardback.
fetching tweet related data from web service and rendering the same to product view
Implemented photo full-size photo viewer using Michael Waterfall's MWPhotoBrowser library.
Handle jshint exceptions in builder visitor

When jshint throws an exception during validation, as reported in
https://github.com/eclipsesource/jshint-eclipse/issues/15, it is
helpful to know which file caused this problem.
Add a double tap listener to frequency field.

Summary:
This isn't a fling method, but it's a step in that direction, proving that it
is possible, and easy, to add a `GestureDetector` to the `EditText.

Right now, this crashes if you double tap when the frequency is over 1000 MHz
due some `Frequency` clownage which will be fixed when D40 lands.

Test Plan:
Played around in the emulator.

- It worked when expected and crashed when expected.

Reviewers: jcarter

Reviewed By: jcarter

Differential Revision: https://phabricator.edgesysdesign.com/D41
Updated the Categories Post Page
Make javascript and css files non-executable
Remove old compressed file
Only trigger a change if the data actually changed
Write a trivial README file
Added config.rb to repositiory.
Changed PicoTTS config

Change-Id: I27dce75efe96eaf6ff3269fa621bd0fbdaa13897
Avoid smooth-scroll issues with multiple cursors
Add link to video.
Remove todo.org - use issues instead
Remove mark-multiple integration

 - it caused more problems than it was solving

Fixes #9
Add some more commands to default run-once/run-for-all lists.
Update documentation.
Bump version to 1.1.0

 - removed integration with mark-multiple
Don't use next-line non-interactively
Add Read More to Blog Posts Index
Loading web resources with guzzle.

Added guzzle as a dependency.
Box repository now fetches URLs with a guzzle http client. This allows
better error handling.
Added comments to box repository
Cosmetics: Naming
Added author annotation in docblocks
Merge pull request #2 from seiffert/master

Replaced file_get_contents with Guzzle and added docblocs
my -> me
design check
Crawler plugin - anchors are removed from links.
Crawler plugin: nonHtmlExtensions = 'css js ico gif jpg jpeg png pdf zip rar xml'.
GitDumpTask - list of repos dumped is logged.
NodeTestTask - xUnit reporting patterns fixes.
NodeExtension.stopCommand added.
Node plugin - updating configs is moved to NodeHelper
Node plugin - updating configs is moved to NodeHelper
Node plugin - updating configs is moved to ConfigHelper
Node plugin - updating configs is moved to ConfigHelper.
Added extension screenshots.
Commit test
Commit class for Utility calculation
monito doesnt close connection
add metadatas to test configuration
#16 display is now ok. bugs remains
#16 git remove not still usefull console.log
#16 merge with last graph-object
Updated Sonic and Soraoto characters with slightly-better moves.
Several characters updated.
bumped version to 1.6.9
gcovr.py patched for windows(cygwin)
Recreated the file I incidentally deleted.  Recreated assembly.  Ready for commentation.
Completed visit(IfSt).
fix seek display
AA: ramips: fix wifi EEPROM extraction on DIR-615-Dx models

Backport of r34876.

Patch from #12636.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34878 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: ramips: fix ASUS WL-330N3G MAC address

Backport of r34877.

The ASUS WL-330N and WL-330N3G has the MAC address stored at
offset 4, not 40. This is verified by reading original ASUS
firmware GPL_WL-330N3G_source.1028/user/rc/common_ex.c and
GPL_WL-330N_source.1021/user/rc/common_ex.c.

Tested on WL-330N3G, it now gets the same MAC as is printed on
the label on the router.

Signed-off-by: Jan Kardell <jan.kardell@arkub.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34879 3c298f89-4303-0410-b956-a3cf2f4a3e73
prepare for 2.2.7 release
yet another fix
no need to parse twice
simple variable names
cleaned up board class a bit.
Tiny refactoring of RH#intialize
Including GPL license
Beleza Github
Make war files created with openshift profile be deployed as ROOT.war
Add Scaladin Helloworld quick start

* Add workaround for JBoss classloader
- collision reflection
- time sync in ball animation
Adding bootstrap and getting started.
Initial working index page.
Very speedy, compressed and awesome.
Second part of commit
Update the garden-app-support
Improve the readme.
Show a db query.
Remove the pin
Rename target visualisation ot circular animation
Rename grid animation to crosshair animation
Corrected New Line Issue, Add Nessus Reporting tool
compressed and removed comments
simplify
add generation counter
major refactor. allow adding patterns to board while game is running
cleanups (moved validator to pf demo).
cleanups (moved validator to pf demo).
cleanups (config files)
update config docs and structure
[OPENENGSB-3021] disable message-encryption by default
[OPENENGSB-3036] increase start-level of openengsb-bundles to 40, so JPA-bundles work correctly
[OPENENGSB-2828] initial ProxyRegistrationManagerImpl
[OPENENGSB-2828] add javadoc
[OPENENGSB-3041] makee outgoing json-filter accept non-wrapped OpenEngSBModels as result
[OPENENGSB-3041] make json-filter accept non-wrapped OpenEngSBModels as parameters
fix ConsoleIT
[OPENENGSB-3044] upgrade cxf to 2.6.1
[OPENENGSB-3043] export javax.activation with version 1.1 to fix WSPortIT
[OPENENGSB-3037] move orienttech-repo to root-pom
[OPENENGSB-3041] apply the workaround for incoming unwrapped models to secure-filter also
[OPENENGSB-3045] remove enum-method from ExampleDomain
Merge pull request #694 from ChristophGr/OPENENGSB-3043

[OPENENGSB-3043] export javax.activation with version 1.1 to fix WSPortIT
[OPENENGSB-3041] add dynamic-import to security-bundle to make the filter work
[OPENENGSB-3041] fix dynamic-import-package instruction
[OPENENGSB-3047] make sure workflows are picked up correctly at startup
[OPENENGSB-3045] remove enum from logevent
[OPENENGSB-2828] fix licenses
[OPENENGSB-3045] fix LogLevel-ref in itests
Merge remote-tracking branch 'christophgr/OPENENGSB-3041'
Unmixes up create and save
Unmixes up create and save
silences change events until save successful, fixes bug
Fix unclosed files
Move into a subdirectory
Relative links
He Has Updated
Add an update script|
adding missing file
now supports base types with generic parameters
almost finished listview+pinchview integration

see swipetest.html
added an weinre debugger
Update wordpress to  3.4.2
Added stub code for flow-mag fusion.
Support for p1
Switching back to HTML form
play-doma doc created
Site updated at 2012-04-13 17:41:23 UTC
[maven-release-plugin] prepare release hms-cassandra-triggers-0.15.2
modify nav design
imroved the gallery display
added _sites/ folder to .gitignorewq
add version, fix git link
requestSubscription
Site updated at 2012-11-17 23:01:18 UTC
Site updated at 2012-12-19 07:01:18 UTC
Site updated at 2012-10-29 22:01:18 UTC
Site updated at 2012-11-21 04:01:17 UTC
Fixing missing favicon on full pages
Site updated at 2012-10-19 04:52:08 UTC
final commit TestCollatz.py.out
fixed error with rand
multi-thread implementation
minor changes
add a function to test all classifiers before joining
Merge branch 'master' of github.com:imcmahon01/Penn-haptics-bolt
Added new download location to the cheetah_lib until Syntouch updates their C drivers to accomodate Cheetah
Merge branch 'master' of github.com:imcmahon01/Penn-haptics-bolt
prevent page reloading when overview tab is clicked
Merge branch 'master' of https://github.com/int128/taskwalls.appspot.com
Add -pipe option to compiler flags.
lib/string & lib/memcpy: use GNU implementation.

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
Fixed article.url issue in top listing of articles from index.html.  Discovered that a symlink to the theme directory is better than copying the theme to the pelican--themes dir.
temp: remove cname
Renaming README to github knows it is markdown syntax.
Improve templates model. Add a method for adding default templates.
Fix a bug in the ajax loading.
Downgrade version number until it is more tested
Initial commit
initial checkin
test change
boilerplate template added
adding extra file or OAuth imigur website
more data
consumer key and secret generated
added information on aixix and iopa diode urls from imgur
Update master
Update master
added thumbnail info to images iopa
finished widget prototype, formatted data for javascript parsing
further dev of spectrograph widget
written program to parse csv data
modified functionial identifiers of aixis diodes
some tweeking after tests
now we use the jquery ajax
Merge branch 'master' of github.com:jacobbogers/diy-laser-device
testcode added to html
rawfileprocessing to arraylines
Add jboss-as:run goal
Updated the README file adding further documentation. This commit marks the v0.4.0 milestone
Merge branch 'trunk'
Added windows cygwin script
Merge branch 'master' of github.com:jasonxrowland/blenderfarmers
Update Form/Type/AuthorizeFormType.php
Merge pull request #75 from geoffreytran/patch-1

Update Form/Type/AuthorizeFormType.php to conform to Symfony2 master
Refactorizada la clase socket, separandola en un modulo de compilacion separado de su header.
Cambiada la interfaz de socket para que use std::string en vez de punteros char* mas propensos a errores.
Removidos algunos includes innecesarios.
Switch from rdiscount to kramdown
Standalone index page

Moved blog index to blog subdirectory